From: Andrzej Popowski <a.popowski@samsung.com>
Date: Tue, 6 Dec 2016 13:49:33 +0000 (+0100)
Subject: [Sound] - Replace deprecated API
X-Git-Tag: submit/tizen_3.0/20161209.094616~1^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F28%2F102828%2F4;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git

[Sound] - Replace deprecated API

TCT result 100% PASS

Change-Id: I301b36d4f3d05249ab06d34c32cba6979e116f04
Signed-off-by: Andrzej Popowski <a.popowski@samsung.com>
---

diff --git a/src/sound/sound_manager.cc b/src/sound/sound_manager.cc
index f0fcf190..d6e62025 100644
--- a/src/sound/sound_manager.cc
+++ b/src/sound/sound_manager.cc
@@ -24,6 +24,7 @@
 #include "common/logger.h"
 #include "common/task-queue.h"
 #include "common/tools.h"
+#include "common/scope_exit.h"
 
 //This constant was originally defined in vconf.h. However, in tizen 3, it
 //appears, it is removed (or defined only in vconf-internals.h)
@@ -445,11 +446,17 @@ void SoundManager::GetDeviceList(sound_device_mask_e mask, picojson::object& out
   picojson::value response = picojson::value(picojson::array());
   picojson::array& response_array = response.get<picojson::array>();
 
-  int ret = sound_manager_get_current_device_list(mask, &device_list);
+  SCOPE_EXIT {
+    if (device_list) {
+      sound_manager_free_device_list(device_list);
+    }
+  };
+
+  int ret = sound_manager_get_device_list(mask, &device_list);
   if (SOUND_MANAGER_ERROR_NONE != ret && SOUND_MANAGER_ERROR_NO_DATA != ret) {
     LogAndReportError(
         PlatformResult(ErrorCode::UNKNOWN_ERR, "Getting device list failed"), &out,
-        ("sound_manager_get_current_device_list error: %d (%s)", ret, get_error_message(ret)));
+        ("sound_manager_get_device_list error: %d (%s)", ret, get_error_message(ret)));
     return;
   }
 
@@ -559,11 +566,17 @@ PlatformResult SoundManager::IsDeviceConnected(sound_device_type_e type,
   sound_device_h device = nullptr;
   sound_device_type_e device_type = SOUND_DEVICE_BUILTIN_SPEAKER;
 
-  int ret = sound_manager_get_current_device_list(mask, &device_list);
+  SCOPE_EXIT {
+    if (device_list) {
+      sound_manager_free_device_list(device_list);
+    }
+  };
+
+  int ret = sound_manager_get_device_list(mask, &device_list);
   if (SOUND_MANAGER_ERROR_NONE != ret) {
     return LogAndCreateResult(
               ErrorCode::UNKNOWN_ERR, "Getting device list failed",
-              ("sound_manager_get_current_device_list error: %d (%s)", ret, get_error_message(ret)));
+              ("sound_manager_get_device_list error: %d (%s)", ret, get_error_message(ret)));
   }
 
   while (!(ret = sound_manager_get_next_device(device_list, &device))) {