[TVAudio] Retrieve audio output mode

Added reference. Added better error handling.

[Verification]
TCT pass:
AudioControlManager_getOutputMode
AudioControlManager_getOutputMode_extra_argument

Change-Id: Ib3590e783fe7b1456cdbf360822b4d03621efa2b
Signed-off-by: Przemyslaw Ciezkowski <p.ciezkowski@samsung.com>

diff --git a/src/tvaudio/tvaudio_instance.cc b/src/tvaudio/tvaudio_instance.cc
index e9a2fda67bf967a85682c21855747577bfa450d0..bcf1b061d4fff0fc6702d9eba4e0b83f82dfcc7a 100644 (file)
--- a/src/tvaudio/tvaudio_instance.cc
+++ b/src/tvaudio/tvaudio_instance.cc
@@ -155,8 +155,12 @@ void TVAudioInstance::getOutputMode(const picojson::value& args,
     if (result.IsError()) {
         LoggerD("Error occured");
         ReportError(result, &out);
+    } else if (AudioOutputModeMap.find(mode) == AudioOutputModeMap.end()) {
+        LoggerE("Unknown mode type: %d", mode);
+        ReportError(common::PlatformResult(common::ErrorCode::UNKNOWN_ERR,
+            "Uknown audio output mode"), &out);
     } else {
-    ReportSuccess(picojson::value(AudioOutputModeMap.at(mode)), out);
+        ReportSuccess(picojson::value(AudioOutputModeMap.at(mode)), out);
     }
 }
 

diff --git a/src/tvaudio/tvaudio_manager.cc b/src/tvaudio/tvaudio_manager.cc
index 0012b4404d76d6b5f2c1398aed722bd9e6435937..6c5e530447553d8e6fad0b254de6a2a5fc706aa6 100755 (executable)
--- a/src/tvaudio/tvaudio_manager.cc
+++ b/src/tvaudio/tvaudio_manager.cc
@@ -164,7 +164,7 @@ common::PlatformResult AudioControlManager::getVolume(u_int16_t &volume) {
     return common::PlatformResult(ErrorCode::NO_ERROR);
 }
 
-common::PlatformResult AudioControlManager::getOutputMode(AudioOutputMode mode) {
+common::PlatformResult AudioControlManager::getOutputMode(AudioOutputMode &mode) {
     LoggerD("Enter");
     avoc_audio_format_e type;
     int ret = avoc_get_audio_format(&type);

diff --git a/src/tvaudio/tvaudio_manager.h b/src/tvaudio/tvaudio_manager.h
index 434d50c56ffc4cefabb28fe47fdaa02892ebb299..3683e463ff923061f9541947d9c11a0c858040a7 100755 (executable)
--- a/src/tvaudio/tvaudio_manager.h
+++ b/src/tvaudio/tvaudio_manager.h
@@ -53,7 +53,7 @@ class AudioControlManager {
     common::PlatformResult setVolumeDown();
     common::PlatformResult playSound(const std::string &type);
     common::PlatformResult getVolume(u_int16_t &volume);
-    common::PlatformResult getOutputMode(AudioOutputMode mode);
+    common::PlatformResult getOutputMode(AudioOutputMode &mode);
     common::PlatformResult registerVolumeChangeListener(VolumeChangeListener* listener);
     common::PlatformResult unregisterVolumeChangeListener();
     static void volumeChangeCallback(unsigned int volume, void* user_data);