diff options
| author | Artem Nosach <ANosach@luxoft.com> | 2015-04-23 15:26:25 +0300 |
|---|---|---|
| committer | Artem Nosach <ANosach@luxoft.com> | 2015-04-23 15:33:25 +0300 |
| commit | 5d9da1aedf9f19b9914b9ebf76961e30769d3f83 (patch) | |
| tree | 8e8727f8a76fe3d5e18d5ea78dc2e4712c4475a7 | |
| parent | 6451d66a31db67c0e936980eb6c4c5cd4cc4811e (diff) | |
| download | sdl_core-5d9da1aedf9f19b9914b9ebf76961e30769d3f83.tar.gz | |
Not a subject for review.
| -rw-r--r-- | src/components/application_manager/src/state_controller.cc | 1 | ||||
| -rw-r--r-- | src/components/media_manager/src/media_manager_impl.cc | 13 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/components/application_manager/src/state_controller.cc b/src/components/application_manager/src/state_controller.cc index d43050978d..c0efe01895 100644 --- a/src/components/application_manager/src/state_controller.cc +++ b/src/components/application_manager/src/state_controller.cc @@ -216,7 +216,6 @@ void StateController::OnStateChanged(ApplicationSharedPtr app, } ApplicationManagerImpl::instance()->OnHMILevelChanged(app->app_id(), old_state->hmi_level(), new_state->hmi_level()); - app->usage_report().RecordHmiStateChanged(new_state->hmi_level()); } else { LOG4CXX_ERROR(logger_, "Status not changed"); } diff --git a/src/components/media_manager/src/media_manager_impl.cc b/src/components/media_manager/src/media_manager_impl.cc index a4de33737e..cb9d5c4ff8 100644 --- a/src/components/media_manager/src/media_manager_impl.cc +++ b/src/components/media_manager/src/media_manager_impl.cc @@ -41,6 +41,7 @@ #include "protocol_handler/protocol_handler.h" #include "utils/file_system.h" #include "utils/logger.h" +#include "utils/helpers.h" #if defined(EXTENDED_MEDIA_MODE) #include "media_manager/audio/a2dp_source_player_adapter.h" #include "media_manager/audio/from_mic_recorder_adapter.h" @@ -88,20 +89,20 @@ void MediaManagerImpl::Init() { #endif if ("socket" == profile::Profile::instance()->video_server_type()) { - video_streamer_ = new SocketVideoStreamerAdapter(); + streamer_[ServiceType::kMobileNav] = new SocketVideoStreamerAdapter(); } else if ("pipe" == profile::Profile::instance()->video_server_type()) { - video_streamer_ = new PipeVideoStreamerAdapter(); + streamer_[ServiceType::kMobileNav] = new PipeVideoStreamerAdapter(); } else if ("file" == profile::Profile::instance()->video_server_type()) { - video_streamer_ = new VideoStreamToFileAdapter( + streamer_[ServiceType::kMobileNav] = new VideoStreamToFileAdapter( profile::Profile::instance()->video_stream_file()); } if ("socket" == profile::Profile::instance()->audio_server_type()) { - audio_streamer_ = new SocketAudioStreamerAdapter(); + streamer_[ServiceType::kAudio] = new SocketAudioStreamerAdapter(); } else if ("pipe" == profile::Profile::instance()->audio_server_type()) { - audio_streamer_ = new PipeAudioStreamerAdapter(); + streamer_[ServiceType::kAudio] = new PipeAudioStreamerAdapter(); } else if ("file" == profile::Profile::instance()->audio_server_type()) { - audio_streamer_ = new VideoStreamToFileAdapter( + streamer_[ServiceType::kAudio] = new VideoStreamToFileAdapter( profile::Profile::instance()->audio_stream_file()); } |