[Sumover-dev] [svn commit] r3888 - vic/trunk/video

[sumover-dev at cs.ucl.ac.uk]

Author: piers
Date: Tue Oct 10 11:49:49 2006
New Revision: 3888

Modified:
   vic/trunk/video/grabber-win32.cpp

Log:
Added status_ return in start() - it may help - not quite sure yet, but its better than an abort() or just not returning on these errors.

Modified: vic/trunk/video/grabber-win32.cpp
==============================================================================
--- vic/trunk/video/grabber-win32.cpp	(original)
+++ vic/trunk/video/grabber-win32.cpp	Tue Oct 10 11:49:49 2006
@@ -634,6 +634,8 @@
 	}
 	if (!capDriverConnect(capwin_, dev_)) {
 		debug_msg( "capDriverConnect: dev=%d failed - %lu\n", dev_, GetLastError());
+				Grabber::status_=-1;
+		return;
 		/*abort();*/
 	}
 
@@ -650,6 +652,8 @@
 	if (!capDriverGetCaps(capwin_, &caps_, sizeof(caps_))) {
 		debug_msg( "capGetDriverCaps: failed - %lu\n", GetLastError());
 		/*abort();*/
+				Grabber::status_=-1;
+		return;
 	}
 
 	debug_msg("capdrivercaps: overlay=%d dlgSource=%d dlgFmt=%d dlgDis=%d init=%d pal=%d\n",