[Iaxclient-cvs] SF.net SVN: iaxclient: [1256] trunk/lib/video.c

[<bc...@us...>]

Revision: 1256
          http://iaxclient.svn.sourceforge.net/iaxclient/?rev=1256&view=rev
Author:   bcholew
Date:     2007-11-01 14:15:30 -0700 (Thu, 01 Nov 2007)

Log Message:
-----------
When checking for changes to the vidcap device list, look at the device's unique id_string. Otherwise two identical webcams would confuse us.

Modified Paths:
--------------
    trunk/lib/video.c

Modified: trunk/lib/video.c
===================================================================
--- trunk/lib/video.c	2007-11-01 17:37:41 UTC (rev 1255)
+++ trunk/lib/video.c	2007-11-01 21:15:30 UTC (rev 1256)
@@ -1377,7 +1377,10 @@
 		 */
 		for ( i = 0; i < vinfo.device_count; i++ )
 		{
-			if ( !strcmp(new_iaxc_dev_list[n].name, vinfo.devices[i].name) )
+			/* check both the device name and its unique identifier */
+			if ( !strcmp(new_iaxc_dev_list[n].name, vinfo.devices[i].name) &&
+					!strcmp(new_iaxc_dev_list[n].id_string,
+							vinfo.devices[i].id_string) )
 			{
 				new_iaxc_dev_list[n].id = vinfo.devices[i].id;
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.