diff options
| author | JackLivio <jack@livio.io> | 2019-08-20 12:53:03 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-08-20 12:53:03 -0400 |
| commit | fc98ca3a571be85cdbb6a3db3d621e7f10fae253 (patch) | |
| tree | d847a32dc9bd60b29314dc6fe8fce0ff69a84885 /src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi | |
| parent | c6e9a9bb55b14571d1f389c75b515a2c1c102f95 (diff) | |
| parent | 2aedd705a97a380a88323b34879d597a797f17c5 (diff) | |
| download | sdl_core-fc98ca3a571be85cdbb6a3db3d621e7f10fae253.tar.gz | |
Merge pull request #2034 from shoamano83/feat/sdl-0138_audio_pass_thru_array
Feat/sdl 0138 audio pass thru array
Diffstat (limited to 'src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi')
| -rw-r--r-- | src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc index 909e3bae47..d2e15d7350 100644 --- a/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc +++ b/src/components/application_manager/rpc_plugins/sdl_rpc_plugin/src/commands/hmi/ui_get_capabilities_response.cc @@ -73,9 +73,17 @@ void UIGetCapabilitiesResponse::Run() { msg_params[hmi_response::soft_button_capabilities]); } - if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) { + // use newer parameter "audioPassThruCapabilitiesList" when available + if (msg_params.keyExists(strings::audio_pass_thru_capabilities_list)) { hmi_capabilities.set_audio_pass_thru_capabilities( - msg_params[strings::audio_pass_thru_capabilities]); + msg_params[strings::audio_pass_thru_capabilities_list]); + } else if (msg_params.keyExists(strings::audio_pass_thru_capabilities)) { + smart_objects::SmartObject audio_pass_thru_capabilities_list( + smart_objects::SmartType_Array); + audio_pass_thru_capabilities_list[0] = + msg_params[strings::audio_pass_thru_capabilities]; + hmi_capabilities.set_audio_pass_thru_capabilities( + audio_pass_thru_capabilities_list); } if (msg_params.keyExists(strings::hmi_capabilities)) { |