diff options
author | Jacob Keeler <jacob.keeler@livioradio.com> | 2020-02-27 13:39:35 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-02-27 13:39:35 -0500 |
commit | 1f02377c4d8424813f933d88d6397ce8dd5a81ec (patch) | |
tree | a5eac7fc96b356599e9a6e770ca82f24d2a61ae3 /src/components/application_manager/include/application_manager/hmi_capabilities_impl.h | |
parent | cf205533033588aa9813912c3ac2fb8b9cc327b3 (diff) | |
parent | 17b491bcda36b5d5ddc30a395fbcac085ffb85be (diff) | |
download | sdl_core-1f02377c4d8424813f933d88d6397ce8dd5a81ec.tar.gz |
Merge branch 'develop' into feature/readme_overhaul
Diffstat (limited to 'src/components/application_manager/include/application_manager/hmi_capabilities_impl.h')
-rw-r--r-- | src/components/application_manager/include/application_manager/hmi_capabilities_impl.h | 53 |
1 files changed, 27 insertions, 26 deletions
diff --git a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h index b4610f0375..b7f41ca297 100644 --- a/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h +++ b/src/components/application_manager/include/application_manager/hmi_capabilities_impl.h @@ -41,10 +41,6 @@ #include "smart_objects/smart_object.h" #include "utils/macro.h" -namespace resumption { -class LastState; -} // namespace resumption - namespace application_manager { class ApplicationManager; @@ -219,7 +215,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported display capabilities */ - const smart_objects::SmartObject* display_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr display_capabilities() const OVERRIDE; /* * @brief Sets supported display capabilities @@ -248,7 +244,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported HMI zone capabilities */ - const smart_objects::SmartObject* hmi_zone_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr hmi_zone_capabilities() const OVERRIDE; /* * @brief Sets supported HMI zone capabilities @@ -263,7 +259,8 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported SoftButton's capabilities */ - const smart_objects::SmartObject* soft_button_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr soft_button_capabilities() + const OVERRIDE; /* * @brief Sets supported SoftButton's capabilities @@ -278,7 +275,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported Button's capabilities */ - const smart_objects::SmartObject* button_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr button_capabilities() const OVERRIDE; /* * @brief Sets supported Button's capabilities @@ -301,7 +298,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported speech capabilities */ - const smart_objects::SmartObject* speech_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr speech_capabilities() const OVERRIDE; /* * @brief Sets supported VR capabilities @@ -316,7 +313,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported VR capabilities */ - const smart_objects::SmartObject* vr_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr vr_capabilities() const OVERRIDE; /* * @brief Sets supported audio_pass_thru capabilities @@ -331,7 +328,7 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported audio_pass_thru capabilities */ - const smart_objects::SmartObject* audio_pass_thru_capabilities() + const smart_objects::SmartObjectSPtr audio_pass_thru_capabilities() const OVERRIDE; /* @@ -347,14 +344,15 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @return Currently supported pcm_streaming capabilities */ - const smart_objects::SmartObject* pcm_stream_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr pcm_stream_capabilities() const OVERRIDE; /* * @brief Retrieves information about the preset bank capabilities * * @return Currently supported preset bank capabilities */ - const smart_objects::SmartObject* preset_bank_capabilities() const OVERRIDE; + const smart_objects::SmartObjectSPtr preset_bank_capabilities() + const OVERRIDE; /* * @brief Sets supported preset bank capabilities @@ -377,14 +375,14 @@ class HMICapabilitiesImpl : public HMICapabilities { * * @param vehicle_type Cuurent vehicle information */ - const smart_objects::SmartObject* vehicle_type() const OVERRIDE; + const smart_objects::SmartObjectSPtr vehicle_type() const OVERRIDE; /* * @brief Retrieves information about the prerecorded speech * * @return Currently supported prerecorded speech */ - const smart_objects::SmartObject* prerecorded_speech() const OVERRIDE; + const smart_objects::SmartObjectSPtr prerecorded_speech() const OVERRIDE; /* * @brief Sets supported prerecorded speech @@ -512,6 +510,9 @@ class HMICapabilitiesImpl : public HMICapabilities { const smart_objects::SmartObject* seat_location_capability() const OVERRIDE; + void Init(resumption::LastStateWrapperPtr last_state_wrapper) OVERRIDE; + + DEPRECATED void Init(resumption::LastState* last_state) OVERRIDE; /* @@ -585,7 +586,7 @@ class HMICapabilitiesImpl : public HMICapabilities { hmi_apis::Common_Language::eType ui_language_; hmi_apis::Common_Language::eType vr_language_; hmi_apis::Common_Language::eType tts_language_; - smart_objects::SmartObject* vehicle_type_; + smart_objects::SmartObjectSPtr vehicle_type_; smart_objects::SmartObject* ui_supported_languages_; smart_objects::SmartObject* tts_supported_languages_; smart_objects::SmartObject* vr_supported_languages_; @@ -594,17 +595,17 @@ class HMICapabilitiesImpl : public HMICapabilities { * system_display_capabilities_. For backward compatibility * display_capabilities_ is not removed. */ - smart_objects::SmartObject* display_capabilities_; + smart_objects::SmartObjectSPtr display_capabilities_; smart_objects::SmartObjectSPtr system_display_capabilities_; - smart_objects::SmartObject* hmi_zone_capabilities_; - smart_objects::SmartObject* soft_buttons_capabilities_; - smart_objects::SmartObject* button_capabilities_; - smart_objects::SmartObject* preset_bank_capabilities_; - smart_objects::SmartObject* vr_capabilities_; - smart_objects::SmartObject* speech_capabilities_; - smart_objects::SmartObject* audio_pass_thru_capabilities_; - smart_objects::SmartObject* pcm_stream_capabilities_; - smart_objects::SmartObject* prerecorded_speech_; + smart_objects::SmartObjectSPtr hmi_zone_capabilities_; + smart_objects::SmartObjectSPtr soft_buttons_capabilities_; + smart_objects::SmartObjectSPtr button_capabilities_; + smart_objects::SmartObjectSPtr preset_bank_capabilities_; + smart_objects::SmartObjectSPtr vr_capabilities_; + smart_objects::SmartObjectSPtr speech_capabilities_; + smart_objects::SmartObjectSPtr audio_pass_thru_capabilities_; + smart_objects::SmartObjectSPtr pcm_stream_capabilities_; + smart_objects::SmartObjectSPtr prerecorded_speech_; bool is_navigation_supported_; bool is_phone_call_supported_; bool is_video_streaming_supported_; |