diff options
| author | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-09-20 11:44:51 -0400 |
|---|---|---|
| committer | Jacob Keeler <jacob.keeler@livioradio.com> | 2016-09-20 14:37:25 -0400 |
| commit | 039581419749dbdd32590804e8b14a77fcaf9636 (patch) | |
| tree | ced927fc4bef4686f7373a5f45dd692bd9fc9de0 /src/appMain/hmi_capabilities.json | |
| parent | 1b96b7c02d2e338b846a7314c6fa0bdaa31f7c5e (diff) | |
| parent | aff7f09a4ec07becfb64dc78992580061d3342ff (diff) | |
| download | sdl_core-039581419749dbdd32590804e8b14a77fcaf9636.tar.gz | |
Merge branch 'master'
Diffstat (limited to 'src/appMain/hmi_capabilities.json')
| -rwxr-xr-x[-rw-r--r--] | src/appMain/hmi_capabilities.json | 40 |
1 files changed, 24 insertions, 16 deletions
diff --git a/src/appMain/hmi_capabilities.json b/src/appMain/hmi_capabilities.json index e97a222368..41cf1d3bee 100644..100755 --- a/src/appMain/hmi_capabilities.json +++ b/src/appMain/hmi_capabilities.json @@ -1,10 +1,10 @@ { "UI": { - "language":"EN_US", + "language":"EN-US", "languages":[ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ], "displayCapabilities": { @@ -312,35 +312,43 @@ { "samplingRate" : "44KHZ", "bitsPerSample" : "RATE_8_BIT", - "audioType" : "PCM" + "audioType" : "PCM" + }, + "pcmStreamCapabilities": + { + "samplingRate" : "16KHZ", + "bitsPerSample" : "RATE_16_BIT", + "audioType" : "PCM" }, "hmiZoneCapabilities":"FRONT", "softButtonCapabilities": - { - "shortPressAvailable":true, - "longPressAvailable" :true, - "upDownAvailable" :true, - "imageSupported" :true - } + [ + { + "shortPressAvailable":true, + "longPressAvailable" :true, + "upDownAvailable" :true, + "imageSupported" :true + } + ] }, "VR": { "capabilities":["TEXT"], - "language":"EN_US", + "language":"EN-US", "languages": [ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ] }, "TTS": { "capabilities":"TEXT", - "language":"EN_US", + "language":"EN-US", "languages": [ - "EN_US","ES_MX","FR_CA","DE_DE","ES_ES","EN_GB","RU_RU","TR_TR","PL_PL","FR_FR","IT_IT","SV_SE","PT_PT","NL_NL","ZH_TW", -"JA_JP","AR_SA","KO_KR","PT_BR","CS_CZ","DA_DK","NO_NO" + "EN-US","ES-MX","FR-CA","DE-DE","ES-ES","EN-GB","RU-RU","TR-TR","PL-PL","FR-FR","IT-IT","SV-SE","PT-PT","NL-NL","ZH-TW", +"JA-JP","AR-SA","KO-KR","PT-BR","CS-CZ","DA-DK","NO-NO" ] }, "Buttons": |