fixup! device-manager: Add 'role' parameter to device_list_get_device()

Change-Id: I10a3720e3b55e39f27aaf21ab057c1be3a1d7040

diff --git a/src/device-manager.c b/src/device-manager.c
index b2e377b..0782054 100644 (file)
--- a/src/device-manager.c
+++ b/src/device-manager.c
@@ -671,14 +671,14 @@ static struct device_status_info* _get_device_status(pa_device_manager *manager,
     pa_assert(manager->device_status);
 
     PA_IDXSET_FOREACH(status_info, manager->device_status, status_idx) {
-        if (device_type_is_equal(status_info->type, type)) {
-            if (system_id) {
-                if (pa_safe_streq(status_info->system_id, system_id))
-                    return status_info;
-                continue;
-            }
+        if (!device_type_is_equal(status_info->type, type))
+            continue;
+
+        if (!system_id)
+            return status_info;
+
+        if (pa_safe_streq(status_info->system_id, system_id))
             return status_info;
-        }
     }
 
     return NULL;
@@ -769,15 +769,13 @@ pa_tz_device* device_list_get_device(pa_device_manager *manager, const char *typ
             if (system_id) {
                 if (pa_safe_streq(pa_tz_device_get_system_id(device), system_id))
                     return device;
-                else
-                    continue;
+                continue;
             }
             /* 2. check role */
             if (role) {
                 if (pa_tz_device_get_role(device, role))
                     return device;
-                else
-                    continue;
+                continue;
             }
             return device;
         }

diff --git a/src/tizen-device.c b/src/tizen-device.c
index 9ea1490..e2c0605 100644 (file)
--- a/src/tizen-device.c
+++ b/src/tizen-device.c
@@ -699,25 +699,21 @@ char* pa_tz_device_get_role(pa_tz_device *device, const char *preferred_role) {
 
     if (device->playback_devices) {
         PA_HASHMAP_FOREACH_KV(role, sink, device->playback_devices, state) {
-            if (preferred_role) {
-                if (pa_safe_streq(role, preferred_role))
-                    return role;
-                else
-                    continue;
-            }
-            return role;
+            if (!preferred_role)
+                return role;
+
+            if (pa_safe_streq(role, preferred_role))
+                return role;
         }
     }
 
     if (device->capture_devices) {
         PA_HASHMAP_FOREACH_KV(role, source, device->capture_devices, state) {
-            if (preferred_role) {
-                if (pa_safe_streq(role, preferred_role))
-                    return role;
-                else
-                    continue;
-            }
-            return role;
+            if (!preferred_role)
+                return role;
+
+            if (pa_safe_streq(role, preferred_role))
+                return role;
         }
     }