Changeset 3196a099a488880b4ad878b3f5e248fad31a59c7

Timestamp:

27/04/08 22:10:44 (6 months ago)

Author:

Felix Paul Kühne <fkuehne@videolan.org>

git-committer:

Felix Paul Kühne <fkuehne@videolan.org> 1209327044 +0200

git-parent:

[de4216e304f2d442ad44d4b9314722581e6e7ff4]

git-author:

Felix Paul Kühne <fkuehne@videolan.org> 1209327044 +0200

Message:

Hack to fix the compilation on 10.4. This should actually be covered by configure, which complains about missing headers, but doesn't disable this module properly.

Files:

• modules/video_output/opengllayer.m (modified) (3 diffs)

modules/video_output/opengllayer.m

@@ -44 +44 @@
-#import <OpenGL/OpenGL.h>
-
+#ifdef CALayer
+
-/* On OS X, use GL_TEXTURE_RECTANGLE_EXT instead of GL_TEXTURE_2D.
-   This allows sizes which are not powers of 2 */
@@ -135 +137 @@
-static int CreateVout( vlc_object_t *p_this )
-{
+    /* This module is Leopard only */
+#ifdef __APPLE__
+    long minorMacVersion;
+    if( Gestalt( gestaltSystemVersionMinor, &minorMacVersion ) == noErr )
+    {
+        if( minorMacVersion < 6 )
+        {
+            msg_Warn( p_vout, "current osx version is 10.%ld, non-suitable for OpenglLayer video output", minorMacVersion );
+            return VLC_ENOOBJ;
+        }
+    }
+    else
+    {
+        msg_Warn( p_vout, "couldn't get OS version" );
+        return VLC_EGENERIC;
+    }
+#endif
+
-    vout_thread_t *p_vout = (vout_thread_t *)p_this;
-    vout_sys_t *p_sys;
@@ -516 +536 @@
-}
-@end
+
+#endif