Merge pull request rdkcentral#345 from ddevad/main

DELIA-45070 - Merge to Main
YS5000 · Oct 9, 2020 · 8bbd944 · 8bbd944
2 parents 87d1d69 + 699751c
commit 8bbd944
Showing 1 changed file with 12 additions and 10 deletions.
diff --git a/DisplaySettings/DisplaySettings.cpp b/DisplaySettings/DisplaySettings.cpp
@@ -1227,14 +1227,15 @@ namespace WPEFramework {
                 LOGINFOMETHOD();
                 bool success = true;
                 string audioPort = parameters.HasLabel("audioPort") ? parameters["audioPort"].String() : "HDMI0";
-                bool enable = false;
+                int boost = 0;
                 try
                 {
                         device::AudioOutputPort aPort = device::Host::getInstance().getAudioOutputPort(audioPort);
                                 if (aPort.isConnected())
                                 {
-                                        enable = aPort.getBassEnhancer();
-                                        response["bassEnhancerEnable"] = enable;
+                                        boost = aPort.getBassEnhancer();
+                                        response["enable"] = boost ? true : false ;
+                                        response["bassBoost"] = boost;
                                 }
                                 else
                                 {
@@ -1246,6 +1247,7 @@ namespace WPEFramework {
                 {
                         LOG_DEVICE_EXCEPTION1(audioPort);
                         success = false;
+                        response["enable"] = false;
                 }
                 returnResponse(success);
         }
@@ -1485,25 +1487,25 @@ namespace WPEFramework {
         uint32_t DisplaySettings::setBassEnhancer(const JsonObject& parameters, JsonObject& response)
         {
                 LOGINFOMETHOD();
-                returnIfParamNotFound(parameters, "bassEnhancerEnable");
-                string sBassEnhancer = parameters["bassEnhancerEnable"].String();
-                bool bassEnhancer = false;
+                returnIfParamNotFound(parameters, "bassBoost");
+                string sBassBoost = parameters["bassBoost"].String();
+                int bassBoost = 0;
                 try {
-                        bassEnhancer = parameters["bassEnhancerEnable"].Boolean();
+                        bassBoost = stoi(sBassBoost);
                 }catch (const device::Exception& err) {
-                        LOG_DEVICE_EXCEPTION1(sBassEnhancer);
+                        LOG_DEVICE_EXCEPTION1(sBassBoost);
                         returnResponse(false);
                 }
                 bool success = true;
                 string audioPort = parameters.HasLabel("audioPort") ? parameters["audioPort"].String() : "HDMI0";
                 try
                 {
                         device::AudioOutputPort aPort = device::Host::getInstance().getAudioOutputPort(audioPort);
-                        aPort.setBassEnhancer(bassEnhancer);
+                        aPort.setBassEnhancer(bassBoost);
                 }
                 catch (const device::Exception& err)
                 {
-                        LOG_DEVICE_EXCEPTION2(audioPort, sBassEnhancer);
+                        LOG_DEVICE_EXCEPTION2(audioPort, sBassBoost);
                         success = false;
                 }
                 returnResponse(success);