[Sumover-dev] [svn commit] r4703 - in vic/branches/cc: .

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

Author: soohyunc
Date: Sun Mar 21 23:30:41 2010
New Revision: 4703

Modified:
   vic/branches/cc/main.cpp
   vic/branches/cc/video/grabber-macosx.cpp

Log:
this commit reflects Revision 4701 from the mpeg4 branch.

copied comments follows:
Removed MacOS X 10.3 workaround code originally from Aqua AG vic which I
initially thought was a Quicktime Pthread related issue and wrote so in the
comments.

It was actually to do with the framework initialization not being called.
Framework initialization is not required and shouldn't be used with MacOS X
10.3.9 and later.




Modified: vic/branches/cc/main.cpp
==============================================================================
--- vic/branches/cc/main.cpp	(original)
+++ vic/branches/cc/main.cpp	Sun Mar 21 23:30:41 2010
@@ -46,12 +46,6 @@
 #include <string.h>
 #include <ctype.h>
 
-
-#if 0
-   // XXX - MacOS X 10.3 Ptheard workaround
-   extern "C" void find_macosx_capture_devices(void);
-#endif
-
 #ifdef WIN32
 //#include <winsock.h>
 #include <process.h>
@@ -498,10 +492,6 @@
 	opterr = 1;
 #endif
 
-#if 0
-       // XXX - MacOS X 10.3 Ptheard workaround
-       find_macosx_capture_devices();
-#endif
 	// Option list; If letter is followed by ':' then it takes an argument
 	const char* options = 
 		"A:B:C:c:D:d:f:F:HI:i:j:K:lL:M:m:N:n:o:Pq:rsST:t:U:u:vV:w:x:X:y";

Modified: vic/branches/cc/video/grabber-macosx.cpp
==============================================================================
--- vic/branches/cc/video/grabber-macosx.cpp	(original)
+++ vic/branches/cc/video/grabber-macosx.cpp	Sun Mar 21 23:30:41 2010
@@ -629,16 +629,7 @@
 };
 
 // Instantiate the video capture device.
-#if 1
-// this doesn't work with MacOS X 10.3 (QuickTime pthread problem),
-// but works fine with 10.4 
 static MacOSXScanner find_capture_devices;
-#else
-// this C function is called from main as a workaround for MacOS X 10.3
-extern "C" void find_macosx_capture_devices(void) {
-    MacOSXScanner macOSXScanner;
-}
-#endif
 
 MacOSXScanner::MacOSXScanner()
 {