Media Manager Component

Signed-off-by: Justin Dickow <jjdickow@gmail.com>

23 files changed, 37 insertions, 109 deletions

diff --git a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
index 4711334c0..9193cfdab 100644
--- a/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/a2dp_source_player_adapter.h
@@ -36,7 +36,6 @@
 #include <map>
 #include "protocol_handler/raw_message.h"
 #include "media_manager/media_adapter_impl.h"
-#include "utils/logger.h"
 
 namespace threads {
 class Thread;
@@ -58,9 +57,6 @@ class A2DPSourcePlayerAdapter : public MediaAdapterImpl {
     class A2DPSourcePlayerThread;
 
     std::map<int32_t, threads::Thread*> sources_;
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
     DISALLOW_COPY_AND_ASSIGN(A2DPSourcePlayerAdapter);
 };
 
diff --git a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
index d01b08af1..b55454c9a 100644
--- a/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
+++ b/src/components/media_manager/include/media_manager/audio/audio_stream_sender_thread.h
@@ -34,7 +34,6 @@
 #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_AUDIO_AUDIO_STREAM_SENDER_THREAD_H_
 
 #include <string>
-#include "utils/logger.h"
 #include "utils/macro.h"
 #include "utils/threads/thread_delegate.h"
 #include "utils/lock.h"
@@ -126,9 +125,6 @@ class AudioStreamSenderThread : public threads::ThreadDelegate {
     sync_primitives::Lock shouldBeStoped_lock_;
 
     static const int32_t kAudioPassThruTimeout;
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
 
     DISALLOW_COPY_AND_ASSIGN(AudioStreamSenderThread);
 };
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
index 9d1bad67b..42ac6b9b8 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_adapter.h
@@ -35,7 +35,6 @@
 
 #include <string>
 #include "media_manager/media_adapter_impl.h"
-#include "utils/logger.h"
 
 namespace threads {
 class Thread;
@@ -59,9 +58,6 @@ class FromMicRecorderAdapter : public MediaAdapterImpl {
     std::string output_file_;
     int32_t duration_;
     const int32_t kDefaultDuration;
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
     DISALLOW_COPY_AND_ASSIGN(FromMicRecorderAdapter);
 };
 }  // namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
index c1c451f62..b2b70d5a1 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_recorder_listener.h
@@ -59,9 +59,6 @@ class FromMicRecorderListener : public MediaAdapterListener {
     threads::Thread* reader_;
     std::string file_name_;
     int32_t current_application_;
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
     DISALLOW_COPY_AND_ASSIGN(FromMicRecorderListener);
 };
 }  //  namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
index d9eeddb4d..ed40df690 100644
--- a/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
+++ b/src/components/media_manager/include/media_manager/audio/from_mic_to_file_recorder_thread.h
@@ -56,10 +56,6 @@ class FromMicToFileRecorderThread : public threads::ThreadDelegate {
     void set_record_duration(int32_t duration);
 
   private:
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
     int32_t argc_;
     gchar** argv_;
 
diff --git a/src/components/media_manager/include/media_manager/media_adapter_impl.h b/src/components/media_manager/include/media_manager/media_adapter_impl.h
index a7d0234b6..158b72d8d 100644
--- a/src/components/media_manager/include/media_manager/media_adapter_impl.h
+++ b/src/components/media_manager/include/media_manager/media_adapter_impl.h
@@ -38,7 +38,6 @@
 #include "media_manager/media_adapter.h"
 #include "media_manager/media_adapter_listener.h"
 #include "utils/macro.h"
-#include "utils/logger.h"
 
 namespace media_manager {
 
@@ -56,10 +55,6 @@ class MediaAdapterImpl : public MediaAdapter {
     int32_t current_application_;
 
   private:
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
     DISALLOW_COPY_AND_ASSIGN(MediaAdapterImpl);
 };
 }  //  namespace media_manager
diff --git a/src/components/media_manager/include/media_manager/media_manager_impl.h b/src/components/media_manager/include/media_manager/media_manager_impl.h
index d0e84a385..061a98d38 100644
--- a/src/components/media_manager/include/media_manager/media_manager_impl.h
+++ b/src/components/media_manager/include/media_manager/media_manager_impl.h
@@ -82,11 +82,7 @@ class MediaManagerImpl : public MediaManager,
     bool                               audio_stream_active_;
 
   private:
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
     DISALLOW_COPY_AND_ASSIGN(MediaManagerImpl);
-
     FRIEND_BASE_SINGLETON_CLASS(MediaManagerImpl);
 };
 
diff --git a/src/components/media_manager/include/media_manager/streamer_listener.h b/src/components/media_manager/include/media_manager/streamer_listener.h
index 7210a1ae4..38e89a2cb 100644
--- a/src/components/media_manager/include/media_manager/streamer_listener.h
+++ b/src/components/media_manager/include/media_manager/streamer_listener.h
@@ -36,7 +36,6 @@
 #include <stdint.h>
 #include "media_manager/media_adapter_listener.h"
 #include "utils/macro.h"
-#include "utils/logger.h"
 
 namespace media_manager {
 class StreamerListener : public MediaAdapterListener {
@@ -53,9 +52,6 @@ class StreamerListener : public MediaAdapterListener {
     virtual void OnActivityEnded(int32_t application_key);
   private:
     int32_t current_application_;
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
     DISALLOW_COPY_AND_ASSIGN(StreamerListener);
 };
 }  //  namespace media_manager
diff --git a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
index 6e59b0eea..697cbcd12 100644
--- a/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
+++ b/src/components/media_manager/src/audio/a2dp_source_player_adapter.cc
@@ -38,14 +38,12 @@
 #include "media_manager/audio/a2dp_source_player_adapter.h"
 #include "utils/lock.h"
 #include "utils/threads/thread_delegate.h"
+#include "utils/logger.h"
 #include "connection_handler/connection_handler_impl.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr A2DPSourcePlayerAdapter::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("A2DPSourcePlayerAdapter"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "A2DPSourcePlayerAdapter")
 
 class A2DPSourcePlayerAdapter::A2DPSourcePlayerThread
     : public threads::ThreadDelegate {
@@ -57,10 +55,6 @@ class A2DPSourcePlayerAdapter::A2DPSourcePlayerThread
     bool exitThreadMain();
 
   private:
-#ifdef ENABLE_LOG
-    static log4cxx::LoggerPtr logger_;
-#endif // ENABLE_LOG
-
     // The Sample format to use
     static const pa_sample_spec sSampleFormat_;
 
@@ -163,11 +157,6 @@ bool A2DPSourcePlayerAdapter::is_app_performing_activity(int32_t
   return (application_key == current_application_);
 }
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr A2DPSourcePlayerAdapter::A2DPSourcePlayerThread::logger_ =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("A2DPSourcePlayerThread"));
-#endif // ENABLE_LOG
-
 const pa_sample_spec A2DPSourcePlayerAdapter::A2DPSourcePlayerThread::
 sSampleFormat_ = {
   /*format*/    PA_SAMPLE_S16LE,
diff --git a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
index 46dcd652b..de00748e4 100644
--- a/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
+++ b/src/components/media_manager/src/audio/audio_stream_sender_thread.cc
@@ -44,6 +44,7 @@
 #include "smart_objects/smart_object.h"
 #include "interfaces/MOBILE_API.h"
 #include "utils/file_system.h"
+#include "utils/logger.h"
 
 #include "media_manager/audio/audio_stream_sender_thread.h"
 #include "application_manager/smart_object_keys.h"
@@ -53,10 +54,8 @@ namespace media_manager {
 using sync_primitives::AutoLock;
 
 const int32_t AudioStreamSenderThread::kAudioPassThruTimeout = 1;
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr AudioStreamSenderThread::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("AudioPassThruThread"));
-#endif // ENABLE_LOG
+
+CREATE_LOGGERPTR_GLOBAL(logger_, "AudioPassThruThread")
 
 AudioStreamSenderThread::AudioStreamSenderThread(
   const std::string fileName, uint32_t session_key)
diff --git a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc
index 4eb3f3cf8..dd08b8a5a 100644
--- a/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc
+++ b/src/components/media_manager/src/audio/from_mic_recorder_adapter.cc
@@ -32,15 +32,13 @@
 
 #include <string>
 #include "utils/threads/thread.h"
+#include "utils/logger.h"
 #include "media_manager/audio/from_mic_to_file_recorder_thread.h"
 #include "media_manager/audio/from_mic_recorder_adapter.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicRecorderAdapter::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("FromMicRecorderAdapter"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicRecorderAdapter")
 
 FromMicRecorderAdapter::FromMicRecorderAdapter()
   : recorder_thread_(NULL)
diff --git a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
index a44b6cee5..f90598729 100644
--- a/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
+++ b/src/components/media_manager/src/audio/from_mic_recorder_listener.cc
@@ -31,15 +31,13 @@
  */
 
 #include "utils/threads/thread.h"
+#include "utils/logger.h"
 #include "media_manager/audio/from_mic_recorder_listener.h"
 #include "media_manager/audio/audio_stream_sender_thread.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicRecorderListener::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("FromMicRecorderListener"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicRecorderListener")
 
 FromMicRecorderListener::FromMicRecorderListener(
   const std::string& file_name)
diff --git a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc
index adf31dedc..dd0beb521 100644
--- a/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc
+++ b/src/components/media_manager/src/audio/from_mic_to_file_recorder_thread.cc
@@ -1,5 +1,5 @@
-/**
-* Copyright (c) 2013, Ford Motor Company
+/*
+* Copyright (c) 2014, Ford Motor Company
 * All rights reserved.
 *
 * Redistribution and use in source and binary forms, with or without
@@ -30,16 +30,14 @@
 * POSSIBILITY OF SUCH DAMAGE.
 */
 
-#include <unistd.h>
-
 #include "media_manager/audio/from_mic_to_file_recorder_thread.h"
+#include <unistd.h>
+#include <sstream>
+#include "utils/logger.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr FromMicToFileRecorderThread::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("FromMicToFileRecorderThread"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "FromMicToFileRecorderThread")
 
 GMainLoop* FromMicToFileRecorderThread::loop = NULL;
 
diff --git a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
index 80b699cb7..5faebf93d 100644
--- a/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
+++ b/src/components/media_manager/src/audio/pipe_audio_streamer_adapter.cc
@@ -32,13 +32,11 @@
 
 #include "media_manager/audio/pipe_audio_streamer_adapter.h"
 #include "config_profile/profile.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeAudioStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeAudioStreamerAdapter")
 
 PipeAudioStreamerAdapter::PipeAudioStreamerAdapter() {
   LOG4CXX_INFO(logger, "PipeAudioStreamerAdapter::PipeAudioStreamerAdapter");
diff --git a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
index 0f6218e67..eb93032e4 100644
--- a/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
+++ b/src/components/media_manager/src/audio/socket_audio_streamer_adapter.cc
@@ -32,14 +32,11 @@
 
 #include "config_profile/profile.h"
 #include "media_manager/audio/socket_audio_streamer_adapter.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketAudioStreamerAdapter"));
-}
-
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketAudioStreamerAdapter")
 
 SocketAudioStreamerAdapter::SocketAudioStreamerAdapter() {
   LOG4CXX_INFO(logger, "SocketAudioStreamerAdapter::SocketAudioStreamerAdapter");
@@ -51,5 +48,4 @@ SocketAudioStreamerAdapter::SocketAudioStreamerAdapter() {
 
 SocketAudioStreamerAdapter::~SocketAudioStreamerAdapter() {
 }
-
 }  // namespace media_manager
diff --git a/src/components/media_manager/src/media_adapter_impl.cc b/src/components/media_manager/src/media_adapter_impl.cc
index bfa072f5f..1a52b003f 100644
--- a/src/components/media_manager/src/media_adapter_impl.cc
+++ b/src/components/media_manager/src/media_adapter_impl.cc
@@ -31,13 +31,11 @@
 */
 
 #include "media_manager/media_adapter_impl.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr MediaAdapterImpl::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("MediaAdapterImpl"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "MediaAdapterImpl")
 
 MediaAdapterImpl::MediaAdapterImpl()
   : current_application_(0) {
diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc
index 1585dd414..15bab011c 100644
--- a/src/components/media_manager/src/media_manager_impl.cc
+++ b/src/components/media_manager/src/media_manager_impl.cc
@@ -39,6 +39,7 @@
 #include "application_manager/application_manager_impl.h"
 #include "application_manager/application_impl.h"
 #include "utils/file_system.h"
+#include "utils/logger.h"
 #if defined(EXTENDED_MEDIA_MODE)
 #include "media_manager/audio/a2dp_source_player_adapter.h"
 #include "media_manager/audio/from_mic_recorder_adapter.h"
@@ -52,10 +53,7 @@
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr MediaManagerImpl::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("MediaManagerImpl"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManagerImpl")
 
 MediaManagerImpl::MediaManagerImpl()
   : protocol_handler_(NULL)
@@ -159,7 +157,7 @@ void MediaManagerImpl::StartMicrophoneRecording(
       application(application_key);
   std::string file_path = profile::Profile::instance()->app_storage_folder();
   file_path += "/";
-  file_path += app->name();
+  file_path += app->folder_name();
   file_system::CreateDirectory(file_path);
 
   file_path += "/";
@@ -185,7 +183,8 @@ void MediaManagerImpl::StartMicrophoneRecording(
     }
   }
   const std::string predefined_rec_file =
-      profile::Profile::instance()->app_storage_folder() + "/audio.8bit.wav";
+      profile::Profile::instance()->app_resourse_folder() + "/" +
+      profile::Profile::instance()->recording_file();
   std::vector<uint8_t> buf;
   if (file_system::ReadBinaryFile(predefined_rec_file, buf)) {
     if (file_system::Write(file_path, buf)) {
diff --git a/src/components/media_manager/src/pipe_streamer_adapter.cc b/src/components/media_manager/src/pipe_streamer_adapter.cc
index 5c24a240e..895c4f4e3 100644
--- a/src/components/media_manager/src/pipe_streamer_adapter.cc
+++ b/src/components/media_manager/src/pipe_streamer_adapter.cc
@@ -30,6 +30,7 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include <errno.h>
 #include <fcntl.h>
 #include <sys/stat.h>
 #include <unistd.h>
@@ -39,10 +40,7 @@
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeStreamerAdapter")
 
 PipeStreamerAdapter::PipeStreamerAdapter()
   : is_ready_(false),
diff --git a/src/components/media_manager/src/socket_streamer_adapter.cc b/src/components/media_manager/src/socket_streamer_adapter.cc
index 914b184f0..bfae327ab 100644
--- a/src/components/media_manager/src/socket_streamer_adapter.cc
+++ b/src/components/media_manager/src/socket_streamer_adapter.cc
@@ -41,13 +41,11 @@
 #include <string.h>
 #include "config_profile/profile.h"
 #include "media_manager/video/socket_video_streamer_adapter.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketStreamerAdapter")
 
 SocketStreamerAdapter::SocketStreamerAdapter()
   : socket_fd_(0),
diff --git a/src/components/media_manager/src/streamer_listener.cc b/src/components/media_manager/src/streamer_listener.cc
index 8a7e024f9..17306f486 100644
--- a/src/components/media_manager/src/streamer_listener.cc
+++ b/src/components/media_manager/src/streamer_listener.cc
@@ -32,13 +32,11 @@
 
 #include "media_manager/streamer_listener.h"
 #include "media_manager/media_manager_impl.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-#ifdef ENABLE_LOG
-log4cxx::LoggerPtr StreamerListener::logger_ = log4cxx::LoggerPtr(
-      log4cxx::Logger::getLogger("StreamerListener"));
-#endif // ENABLE_LOG
+CREATE_LOGGERPTR_GLOBAL(logger_, "StreamerListener")
 
 StreamerListener::StreamerListener()
   : current_application_(0) {
diff --git a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
index 9444ddfeb..fc0668b8d 100644
--- a/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
+++ b/src/components/media_manager/src/video/pipe_video_streamer_adapter.cc
@@ -35,10 +35,7 @@
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("PipeVideoStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "PipeVideoStreamerAdapter")
 
 PipeVideoStreamerAdapter::PipeVideoStreamerAdapter() {
   LOG4CXX_INFO(logger, "PipeVideoStreamerAdapter::PipeVideoStreamerAdapter");
diff --git a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
index 72463b3e1..9fe16d6e9 100644
--- a/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
+++ b/src/components/media_manager/src/video/socket_video_streamer_adapter.cc
@@ -32,13 +32,11 @@
 
 #include "config_profile/profile.h"
 #include "media_manager/video/socket_video_streamer_adapter.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("SocketVideoStreamerAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "SocketVideoStreamerAdapter")
 
 SocketVideoStreamerAdapter::SocketVideoStreamerAdapter() {
   LOG4CXX_INFO(logger, "SocketVideoStreamerAdapter::SocketVideoStreamerAdapter");
diff --git a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
index 6d063eb44..723ddf620 100644
--- a/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
+++ b/src/components/media_manager/src/video/video_stream_to_file_adapter.cc
@@ -32,13 +32,11 @@
 
 #include "media_manager/video/video_stream_to_file_adapter.h"
 #include "utils/file_system.h"
+#include "utils/logger.h"
 
 namespace media_manager {
 
-namespace {
-log4cxx::LoggerPtr logger =
-  log4cxx::LoggerPtr(log4cxx::Logger::getLogger("VideoStreamToFileAdapter"));
-}
+CREATE_LOGGERPTR_GLOBAL(logger, "VideoStreamToFileAdapter")
 
 VideoStreamToFileAdapter::VideoStreamToFileAdapter(const std::string& file_name)
   : file_name_(file_name),