diff options
author | Andrey Oleynik (GitHub) <aoleynik@luxoft.com> | 2017-09-21 19:03:44 +0300 |
---|---|---|
committer | Andriy Byzhynar <AByzhynar@luxoft.com> | 2018-01-18 11:28:38 +0200 |
commit | 7d03482c7f9689a375cd87f3acabda1b9af7624f (patch) | |
tree | 7840ca08e1c3697fd0beb188efcb6a53df75b9d9 /src/components/application_manager/src/hmi_state.cc | |
parent | 8fa4f3b498916b89552394d25f9482ce4b06de5a (diff) | |
download | sdl_core-7d03482c7f9689a375cd87f3acabda1b9af7624f.tar.gz |
Reverts deprecated interfaces
Diffstat (limited to 'src/components/application_manager/src/hmi_state.cc')
-rw-r--r-- | src/components/application_manager/src/hmi_state.cc | 58 |
1 files changed, 58 insertions, 0 deletions
diff --git a/src/components/application_manager/src/hmi_state.cc b/src/components/application_manager/src/hmi_state.cc index d31ff364ea..f67de7a957 100644 --- a/src/components/application_manager/src/hmi_state.cc +++ b/src/components/application_manager/src/hmi_state.cc @@ -56,6 +56,28 @@ HmiState::HmiState(utils::SharedPtr<Application> app, , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM) , system_context_(mobile_apis::SystemContext::INVALID_ENUM) {} +// DEPRECATED +HmiState::HmiState(uint32_t app_id, + const ApplicationManager& app_mngr, + StateID state_id) + : state_id_(state_id) + , app_mngr_(app_mngr) + , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM) + , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM) + , system_context_(mobile_apis::SystemContext::INVALID_ENUM) { + app_ = app_mngr_.application(app_id); +} + +// DEPRECATED +HmiState::HmiState(uint32_t app_id, const ApplicationManager& app_mngr) + : state_id_(STATE_ID_REGULAR) + , app_mngr_(app_mngr) + , hmi_level_(mobile_apis::HMILevel::INVALID_ENUM) + , audio_streaming_state_(mobile_apis::AudioStreamingState::INVALID_ENUM) + , system_context_(mobile_apis::SystemContext::INVALID_ENUM) { + app_ = app_mngr_.application(app_id); +} + void HmiState::set_parent(HmiStatePtr parent) { DCHECK_OR_RETURN_VOID(parent); parent_ = parent; @@ -87,10 +109,18 @@ VRHmiState::VRHmiState(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_VR_SESSION) {} +// DEPRECATED +VRHmiState::VRHmiState(uint32_t app_id, const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_VR_SESSION) {} + TTSHmiState::TTSHmiState(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_TTS_SESSION) {} +// DEPRECATED +TTSHmiState::TTSHmiState(uint32_t app_id, const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_TTS_SESSION) {} + mobile_apis::AudioStreamingState::eType TTSHmiState::audio_streaming_state() const { using namespace helpers; @@ -110,6 +140,11 @@ NaviStreamingHmiState::NaviStreamingHmiState(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_NAVI_STREAMING) {} +// DEPRECATED +NaviStreamingHmiState::NaviStreamingHmiState(uint32_t app_id, + const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_NAVI_STREAMING) {} + mobile_apis::AudioStreamingState::eType NaviStreamingHmiState::audio_streaming_state() const { using namespace helpers; @@ -130,6 +165,11 @@ PhoneCallHmiState::PhoneCallHmiState(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_PHONE_CALL) {} +// DEPRECATED +PhoneCallHmiState::PhoneCallHmiState(uint32_t app_id, + const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_PHONE_CALL) {} + mobile_apis::HMILevel::eType PhoneCallHmiState::hmi_level() const { using namespace helpers; using namespace mobile_apis; @@ -151,10 +191,20 @@ SafetyModeHmiState::SafetyModeHmiState(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_SAFETY_MODE) {} +// DEPRECATED +SafetyModeHmiState::SafetyModeHmiState(uint32_t app_id, + const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_SAFETY_MODE) {} + DeactivateHMI::DeactivateHMI(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_DEACTIVATE_HMI) {} +// DERECATED +DeactivateHMI::DeactivateHMI(uint32_t app_id, + const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_DEACTIVATE_HMI) {} + mobile_apis::HMILevel::eType DeactivateHMI::hmi_level() const { using namespace helpers; using namespace mobile_apis; @@ -170,6 +220,10 @@ AudioSource::AudioSource(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_AUDIO_SOURCE) {} +// DEPRECATED +AudioSource::AudioSource(uint32_t app_id, const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_AUDIO_SOURCE) {} + mobile_apis::HMILevel::eType AudioSource::hmi_level() const { using namespace mobile_apis; using namespace helpers; @@ -191,6 +245,10 @@ EmbeddedNavi::EmbeddedNavi(utils::SharedPtr<Application> app, const ApplicationManager& app_mngr) : HmiState(app, app_mngr, STATE_ID_EMBEDDED_NAVI) {} +// DEPRECATED +EmbeddedNavi::EmbeddedNavi(uint32_t app_id, const ApplicationManager& app_mngr) + : HmiState(app_id, app_mngr, STATE_ID_EMBEDDED_NAVI) {} + mobile_apis::HMILevel::eType EmbeddedNavi::hmi_level() const { using namespace mobile_apis; using namespace helpers; |