[Sumover-dev] [svn commit] r4022 - vic/branches/mpeg4/video

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

Author: piers
Date: Thu May 10 11:17:10 2007
New Revision: 4022

Modified:
   vic/branches/mpeg4/video/grabber-macosx.cpp

Log:
Added fix (from Apple Tcl header files) for X.h clash for definition of Cursor with Quicktime.h 
Changed device detection so it works using standard VIC way (using static class as startup) - as opposed to the 10.3 compatible way of adding some calls in main.cpp - It now doesn't run on 10.3 but we cannot support old stuff (and there are other issues with 10.3).


Modified: vic/branches/mpeg4/video/grabber-macosx.cpp
==============================================================================
--- vic/branches/mpeg4/video/grabber-macosx.cpp	(original)
+++ vic/branches/mpeg4/video/grabber-macosx.cpp	Thu May 10 11:17:10 2007
@@ -36,8 +36,8 @@
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE
  * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-						  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
-						  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+ * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
@@ -47,6 +47,10 @@
 #include <Carbon/Carbon.h>
 #include <stdio.h>
 
+#if !defined(MAC_TCL) && !defined(MAC_OSX_TK)
+#define Cursor XCursor
+#endif
+
 #include "grabber.h"
 #include "vic_tcl.h"
 #include "device-input.h"
@@ -622,7 +626,7 @@
 };
 
 // Instantiate the video capture device.
-#if 0
+#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;