Commit e62feac0 authored by Jean-Baptiste Kempf's avatar 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
parent 617801b6
...@@ -35,9 +35,6 @@ SOURCES_macosx = \ ...@@ -35,9 +35,6 @@ SOURCES_macosx = \
simple_prefs.m \ simple_prefs.m \
output.h \ output.h \
output.m \ output.m \
vout.m \
voutgl.m \
vout.h \
wizard.h \ wizard.h \
wizard.m \ wizard.m \
extended.h \ extended.h \
......
...@@ -417,7 +417,7 @@ static VLCExtended *_o_sharedInstance = nil; ...@@ -417,7 +417,7 @@ static VLCExtended *_o_sharedInstance = nil;
if( p_vout != NULL ) 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 ); var_Set( p_real_vout, "macosx-opaqueness", val );
while ((o_window = [o_enumerator nextObject])) while ((o_window = [o_enumerator nextObject]))
......
...@@ -353,7 +353,7 @@ static VLCMain *_o_sharedMainInstance = nil; ...@@ -353,7 +353,7 @@ static VLCMain *_o_sharedMainInstance = nil;
o_wizard = [[VLCWizard alloc] init]; o_wizard = [[VLCWizard alloc] init];
o_extended = nil; o_extended = nil;
o_bookmarks = [[VLCBookmarks alloc] init]; o_bookmarks = [[VLCBookmarks alloc] init];
o_embedded_list = [[VLCEmbeddedList alloc] init]; o_embedded_list = NULL; // [[VLCEmbeddedList alloc] init];
o_coredialogs = [[VLCCoreDialogProvider alloc] init]; o_coredialogs = [[VLCCoreDialogProvider alloc] init];
o_info = [[VLCInfo alloc] init]; o_info = [[VLCInfo alloc] init];
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
* Eugenio Jarosiewicz <ej0@cise.ufl.edu> * Eugenio Jarosiewicz <ej0@cise.ufl.edu>
* Florian G. Pflug <fgp@phlo.org> * Florian G. Pflug <fgp@phlo.org>
* Jon Lech Johansen <jon-vl@nanocrew.net> * Jon Lech Johansen <jon-vl@nanocrew.net>
* *
* *
* This program is free software; you can redistribute it and/or modify * 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 * it under the terms of the GNU General Public License as published by
...@@ -44,8 +44,10 @@ ...@@ -44,8 +44,10 @@
int OpenIntf ( vlc_object_t * ); int OpenIntf ( vlc_object_t * );
void CloseIntf ( vlc_object_t * ); void CloseIntf ( vlc_object_t * );
#if 0
int OpenVideoGL ( vlc_object_t * ); int OpenVideoGL ( vlc_object_t * );
void CloseVideoGL ( vlc_object_t * ); void CloseVideoGL ( vlc_object_t * );
#endif
/***************************************************************************** /*****************************************************************************
* Module descriptor * Module descriptor
...@@ -121,6 +123,7 @@ vlc_module_begin () ...@@ -121,6 +123,7 @@ vlc_module_begin ()
add_bool( "macosx-mediakeys-background", true, NULL, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT, add_bool( "macosx-mediakeys-background", true, NULL, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT,
false ) false )
#if 0
add_submodule () add_submodule ()
set_description( "Mac OS X OpenGL" ) set_description( "Mac OS X OpenGL" )
set_capability( "opengl provider", 100 ) set_capability( "opengl provider", 100 )
...@@ -138,5 +141,6 @@ vlc_module_begin () ...@@ -138,5 +141,6 @@ vlc_module_begin ()
false ) false )
add_bool( "macosx-background", false, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT, add_bool( "macosx-background", false, NULL, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
false ) false )
#endif
vlc_module_end () vlc_module_end ()
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment