diff options
| author | Sho Amano <samano@xevo.com> | 2018-02-27 18:56:52 +0900 |
|---|---|---|
| committer | Sho Amano <samano@xevo.com> | 2019-07-25 20:10:10 +0900 |
| commit | 2b873846bf87d792882bcd395dbcf462f015f4e2 (patch) | |
| tree | ecfa160ee6f8ed8cc56f5ea53ff5c27ac0226371 /src/components/application_manager/include/application_manager | |
| parent | e9d7ae033dc710ac899f994b2b01f8535f35741d (diff) | |
| download | sdl_core-2b873846bf87d792882bcd395dbcf462f015f4e2.tar.gz | |
Update audioPassThruCapabilities in hmi_capabilities.json to array
Also, hmi_capabilities_impl.cc is updated to support
both old and new formats of the json file.
Diffstat (limited to 'src/components/application_manager/include/application_manager')
| -rw-r--r-- | src/components/application_manager/include/application_manager/hmi_capabilities_impl.h | 12 |
1 files changed, 12 insertions, 0 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 94fc293c3e..c4698ae084 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 @@ -542,6 +542,18 @@ class HMICapabilitiesImpl : public HMICapabilities { const Json::Value& json_languages, smart_objects::SmartObject& languages) const OVERRIDE; + /* + * @brief function that converts a single entry of audio pass thru capability + * to smart object + * + * @param capability json object that represents a single entry of audio pass + * thru capability + * @param output_so the converted object + */ + void convert_audio_capability_to_obj( + const Json::Value& capability, + smart_objects::SmartObject& output_so) const OVERRIDE; + private: bool is_vr_cooperating_; bool is_tts_cooperating_; |