diff options
author | Sho Amano <samano@xevo.com> | 2018-02-27 19:01:27 +0900 |
---|---|---|
committer | Sho Amano <samano@xevo.com> | 2019-07-25 20:10:14 +0900 |
commit | 83f9d97a64443d06a919ef31554ce126307ee8c6 (patch) | |
tree | 9bbfd5e1956daa42e380b44b0e6322f2798bdb5a | |
parent | 2b873846bf87d792882bcd395dbcf462f015f4e2 (diff) | |
download | sdl_core-83f9d97a64443d06a919ef31554ce126307ee8c6.tar.gz |
Use utility method for reading pcmStreamCapabilities also
-rw-r--r-- | src/components/application_manager/src/hmi_capabilities_impl.cc | 21 |
1 files changed, 1 insertions, 20 deletions
diff --git a/src/components/application_manager/src/hmi_capabilities_impl.cc b/src/components/application_manager/src/hmi_capabilities_impl.cc index 6d0834dd42..3b101e73a8 100644 --- a/src/components/application_manager/src/hmi_capabilities_impl.cc +++ b/src/components/application_manager/src/hmi_capabilities_impl.cc @@ -1088,26 +1088,7 @@ bool HMICapabilitiesImpl::load_capabilities_from_file() { Json::Value pcm_capabilities = ui.get("pcmStreamCapabilities", ""); smart_objects::SmartObject pcm_capabilities_so = smart_objects::SmartObject(smart_objects::SmartType_Map); - - if (check_existing_json_member(pcm_capabilities, "samplingRate")) { - pcm_capabilities_so["samplingRate"] = - sampling_rate_enum - .find(pcm_capabilities.get("samplingRate", "").asString()) - ->second; - } - if (check_existing_json_member(pcm_capabilities, "bitsPerSample")) { - pcm_capabilities_so["bitsPerSample"] = - bit_per_sample_enum - .find(pcm_capabilities.get("bitsPerSample", "").asString()) - ->second; - } - if (check_existing_json_member(pcm_capabilities, "audioType")) { - pcm_capabilities_so["audioType"] = - audio_type_enum - .find(pcm_capabilities.get("audioType", "").asString()) - ->second; - } - + convert_audio_capability_to_obj(pcm_capabilities, pcm_capabilities_so); set_pcm_stream_capabilities(pcm_capabilities_so); } |