From: gla <gla@witbe.net>
Date: Tue, 20 Aug 2019 10:44:44 +0000 (+0200)
Subject: dshowsrcwrapper: fix regression on device selection
X-Git-Tag: accepted/tizen/unified/20220217.153506~2^2~10^2~9^2~12^2~2^2~90^2~1^2~37
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1298e6a18668b229384c61c347e920065507228d;p=platform%2Fupstream%2Fgstreamer.git

dshowsrcwrapper: fix regression on device selection

Do not take device_name if a device has been specified. Do not take device_index into account if a device or a device name has been specified.
---

diff --git a/sys/dshowsrcwrapper/gstdshow.cpp b/sys/dshowsrcwrapper/gstdshow.cpp
index 24a241a..2b41dcb 100644
--- a/sys/dshowsrcwrapper/gstdshow.cpp
+++ b/sys/dshowsrcwrapper/gstdshow.cpp
@@ -443,10 +443,10 @@ gst_dshow_select_device (const GUID * device_category,
     if (device && g_strcmp0 (device, entry->device) == 0) {
       selected = entry;
       break;
-    } else if (device_name && g_strcmp0 (device_name, entry->device_name) == 0) {
+    } else if (!device && device_name && g_strcmp0 (device_name, entry->device_name) == 0) {
       selected = entry;
       break;
-    } else if (device_index == entry->device_index) {
+    } else if (!device && !deviceName && device_index == entry->device_index) {
       selected = entry;
       break;
     }