[vlc-commits] commit: MacOS: don't compile opengl provider in the GUI since it doesn' t compile... (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Mon Jul 19 17:56:20 2010 +0200| [e62feac00d9f66cd9c5cb39eee86102a2bd16f5a] | committer: Jean-Baptiste Kempf 

MacOS: don't compile opengl provider in the GUI since it doesn't compile...

This doesn't make it usable though, but noone seems to care anyway...
WARNING: this is a HUGE hack. It will kill yourself and your kittens

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=e62feac00d9f66cd9c5cb39eee86102a2bd16f5a
---

 modules/gui/macosx/Modules.am |    3 ---
 modules/gui/macosx/extended.m |    2 +-
 modules/gui/macosx/intf.m     |    2 +-
 modules/gui/macosx/macosx.m   |    6 +++++-
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am
index b07dde5..647c730 100644
--- a/modules/gui/macosx/Modules.am
+++ b/modules/gui/macosx/Modules.am
@@ -35,9 +35,6 @@ SOURCES_macosx = \
 	simple_prefs.m \
 	output.h \
 	output.m \
-	vout.m \
-	voutgl.m \
-	vout.h \
 	wizard.h \
 	wizard.m \
 	extended.h \
diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index 9f11a18..497730c 100644
--- a/modules/gui/macosx/extended.m
+++ b/modules/gui/macosx/extended.m
@@ -417,7 +417,7 @@ static VLCExtended *_o_sharedInstance = nil;
 
     if( p_vout != NULL )
     {
-        p_real_vout = [VLCVoutView realVout: p_vout];
+        p_real_vout = NULL; // [VLCVoutView realVout: p_vout];
         var_Set( p_real_vout, "macosx-opaqueness", val );
 
         while ((o_window = [o_enumerator nextObject]))
diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m
index ac81974..21098e9 100644
--- a/modules/gui/macosx/intf.m
+++ b/modules/gui/macosx/intf.m
@@ -353,7 +353,7 @@ static VLCMain *_o_sharedMainInstance = nil;
     o_wizard = [[VLCWizard alloc] init];
     o_extended = nil;
     o_bookmarks = [[VLCBookmarks alloc] init];
-    o_embedded_list = [[VLCEmbeddedList alloc] init];
+    o_embedded_list = NULL; // [[VLCEmbeddedList alloc] init];
     o_coredialogs = [[VLCCoreDialogProvider alloc] init];
     o_info = [[VLCInfo alloc] init];
 
diff --git a/modules/gui/macosx/macosx.m b/modules/gui/macosx/macosx.m
index 5346b0a..ebb5c3a 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -8,7 +8,7 @@
  *          Eugenio Jarosiewicz <ej0 at cise.ufl.edu>
  *          Florian G. Pflug <fgp at phlo.org>
  *          Jon Lech Johansen <jon-vl at nanocrew.net>
- *          
+ *
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -44,8 +44,10 @@
 int  OpenIntf     ( vlc_object_t * );
 void CloseIntf    ( vlc_object_t * );
 
+#if 0
 int  OpenVideoGL  ( vlc_object_t * );
 void CloseVideoGL ( vlc_object_t * );
+#endif
 
 /*****************************************************************************
  * Module descriptor
@@ -121,6 +123,7 @@ vlc_module_begin ()
     add_bool( "macosx-mediakeys-background", true, NULL, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT,
              false )
 
+#if 0
     add_submodule ()
         set_description( "Mac OS X OpenGL" )
         set_capability( "opengl provider", 100 )
@@ -138,5 +141,6 @@ vlc_module_begin ()
                   false )
         add_bool( "macosx-background", false, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
                   false )
+#endif
 vlc_module_end ()