Do not check stream role in audio_update_route_option() 72/146472/1
authorSangchul Lee <sc11.lee@samsung.com>
Mon, 28 Aug 2017 07:29:30 +0000 (16:29 +0900)
committerSangchul Lee <sc11.lee@samsung.com>
Mon, 28 Aug 2017 07:29:30 +0000 (16:29 +0900)
It is possible to be invoked this function with null of stream role(option->role).

[Version] 0.1.6
[Profile] Wearable
[Issue Type] Enhancement

Change-Id: I55c03c8d60f3ddfb895de67dd39d23b9429d35b1
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
packaging/audio-hal-wm1831-tw2.spec
tizen-audio-routing.c

index 1ca7282..481eb27 100644 (file)
@@ -1,6 +1,6 @@
 Name:       audio-hal-wm1831-tw2
 Summary:    TIZEN Audio HAL for WM1831(TW2)
-Version:    0.1.5
+Version:    0.1.6
 Release:    0
 Group:      System/Libraries
 License:    Apache-2.0
index fcf297a..fa47e8f 100644 (file)
@@ -522,16 +522,14 @@ audio_return_t audio_update_route_option(void *audio_handle, audio_route_option_
     AUDIO_RETURN_VAL_IF_FAIL(option, AUDIO_ERR_PARAMETER);
 
     AUDIO_LOG_INFO("role:%s, name:%s, value:%d", option->role, option->name, option->value);
-    if (!strncmp("voice-recognition", option->role, MAX_NAME_LEN) ||
-        !strncmp("voice-information", option->role, MAX_NAME_LEN)) {
-        if (!strncmp("bt-wideband", option->name, MAX_NAME_LEN))
-            ah->device.bt_wideband = (option->value > 0) ? true : false;
-
-    } else if (!strncmp("call-voice", option->role, MAX_NAME_LEN)) {
-        if (!strncmp("bt-wideband", option->name, MAX_NAME_LEN))
-            ah->device.bt_wideband = (option->value > 0) ? true : false;
-        if (!strncmp("call-wideband", option->name, MAX_NAME_LEN))
-            ah->call_wideband = (option->value > 0) ? true : false;
+
+    if (!strncmp("bt-wideband", option->name, MAX_NAME_LEN)) {
+        ah->device.bt_wideband = (option->value > 0) ? true : false;
+    } else if (!strncmp("call-wideband", option->name, MAX_NAME_LEN)) {
+        ah->call_wideband = (option->value > 0) ? true : false;
+    } else {
+        AUDIO_LOG_ERROR("undefined route option");
+        audio_ret = AUDIO_ERR_UNDEFINED;
     }
 
     return audio_ret;