[vlc-commits] macosx vout: reenabled. will break compilation until fixed

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat Feb  5 16:07:19 2011 +0100| [195f9041d26f0375638af1d452aa1d95733b8606] | committer: Felix Paul Kühne

macosx vout: reenabled. will break compilation until fixed

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

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

diff --git a/modules/gui/macosx/Modules.am b/modules/gui/macosx/Modules.am
index 647c730..d6ee3ea 100644
--- a/modules/gui/macosx/Modules.am
+++ b/modules/gui/macosx/Modules.am
@@ -51,5 +51,8 @@ SOURCES_macosx = \
 	fspanel.h \
 	eyetv.h \
 	eyetv.m \
+	vout.h \
+	vout.m \
+	voutgl.m \
 	$(NULL)
 
diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m
index 497730c..9f11a18 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 = NULL; // [VLCVoutView realVout: p_vout];
+        p_real_vout = [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 689c4fa..b227981 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 = NULL; // [[VLCEmbeddedList alloc] init];
+    o_embedded_list = [[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 42b4768..64f3479 100644
--- a/modules/gui/macosx/macosx.m
+++ b/modules/gui/macosx/macosx.m
@@ -44,10 +44,8 @@
 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
@@ -123,7 +121,6 @@ vlc_module_begin ()
     add_bool( "macosx-mediakeys-background", true, USE_MEDIAKEYS_BACKGROUND_TEXT, USE_MEDIAKEYS_BACKGROUND_LONGTEXT,
              false )
 
-#if 0
     add_submodule ()
         set_description( "Mac OS X OpenGL" )
         set_capability( "opengl provider", 100 )
@@ -141,6 +138,5 @@ vlc_module_begin ()
                   false )
         add_bool( "macosx-background", false, BACKGROUND_TEXT, BACKGROUND_LONGTEXT,
                   false )
-#endif
 vlc_module_end ()
 
diff --git a/modules/gui/macosx/vout.m b/modules/gui/macosx/vout.m
index c5b87ab..487c1eb 100644
--- a/modules/gui/macosx/vout.m
+++ b/modules/gui/macosx/vout.m
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * vout.m: MacOS X video output module
  *****************************************************************************
- * Copyright (C) 2001-2009 the VideoLAN team
+ * Copyright (C) 2001-2011 the VideoLAN team
  * $Id$
  *
  * Authors: Colin Delacroix <colin at zoy.org>
@@ -51,6 +51,8 @@
 #import "embeddedwindow.h"
 
 #include <vlc_common.h>
+#include <vlc_vout_window.h>
+#include <vlc_vout_display.h>
 #include <vlc_keys.h>
 
 /*****************************************************************************
diff --git a/src/libvlc.c b/src/libvlc.c
index 1b37af5..0bb124e 100644
--- a/src/libvlc.c
+++ b/src/libvlc.c
@@ -953,6 +953,7 @@ int libvlc_InternalInit( libvlc_int_t *p_libvlc, int i_argc,
     var_Create( p_libvlc, "drawable-clip-left", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-clip-bottom", VLC_VAR_INTEGER );
     var_Create( p_libvlc, "drawable-clip-right", VLC_VAR_INTEGER );
+    var_Create( p_libvlc, "drawable-nsobject", VLC_VAR_ADDRESS );
 #endif
 #ifdef WIN32
     var_Create( p_libvlc, "drawable-hwnd", VLC_VAR_ADDRESS );