diff options
| author | Kozoriz <kozorizandriy@gmail.com> | 2016-04-11 16:36:07 +0300 |
|---|---|---|
| committer | Kozoriz <kozorizandriy@gmail.com> | 2016-04-25 12:15:46 +0300 |
| commit | c3aa4341e749b96b2eaccd8d41193e458345890d (patch) | |
| tree | 23114e883fe85583eaadb9a0225eac021a473e05 /src/components/media_manager/src | |
| parent | 3a56902230f1fc450605c355394e405dc125616b (diff) | |
| download | sdl_core-c3aa4341e749b96b2eaccd8d41193e458345890d.tar.gz | |
Media manager update after removing all singletons
Diffstat (limited to 'src/components/media_manager/src')
4 files changed, 6 insertions, 5 deletions
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 464ccc4cd2..9a5907d4f2 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 @@ -92,7 +92,6 @@ void A2DPSourcePlayerAdapter::StartActivity(int32_t application_key) { current_application_ = application_key; const protocol_handler::SessionObserver& session_observer = - application_manager::ApplicationManagerImpl::instance() ->connection_handler() .get_session_observer(); 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 2ce0fdd306..eb41a84a09 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 @@ -39,7 +39,7 @@ #include <string> #include <string.h> -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "application_manager/mobile_command_factory.h" #include "application_manager/application_impl.h" #include "smart_objects/smart_object.h" 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 8fb359976a..88581fd180 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 @@ -39,7 +39,8 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") -FromMicRecorderListener::FromMicRecorderListener(const std::string& file_name, application_manager::ApplicationManager &app_mngr) +FromMicRecorderListener::FromMicRecorderListener( + const std::string& file_name, application_manager::ApplicationManager& app_mngr) : reader_(NULL), file_name_(file_name), application_manager_(app_mngr) {} FromMicRecorderListener::~FromMicRecorderListener() { diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index df4e3d17bb..60cdb9739a 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -36,7 +36,7 @@ #include "media_manager/streamer_listener.h" #include "application_manager/message_helper.h" #include "application_manager/application.h" -#include "application_manager/application_manager_impl.h" +#include "application_manager/application_manager.h" #include "application_manager/application_impl.h" #include "protocol_handler/protocol_handler.h" #include "utils/file_system.h" @@ -59,7 +59,8 @@ namespace media_manager { CREATE_LOGGERPTR_GLOBAL(logger_, "MediaManager") -MediaManagerImpl::MediaManagerImpl(application_manager::ApplicationManager &application_manager, +MediaManagerImpl::MediaManagerImpl( + application_manager::ApplicationManager& application_manager, const MediaManagerSettings& settings) : settings_(settings), protocol_handler_(NULL) |