* removed some further hangover from the original patch and finally added embeddedWin...

diff --git a/extras/MacOSX/vlc.pbproj/project.pbxproj b/extras/MacOSX/vlc.pbproj/project.pbxproj
index 32bfc1aba9647cfadf46f00ffd5392dd5f84e381..c0e2045f5ebaf2135bc5f4cd0ef194609aebbe62 100644 (file)
--- a/extras/MacOSX/vlc.pbproj/project.pbxproj
+++ b/extras/MacOSX/vlc.pbproj/project.pbxproj
@@ -974,6 +974,8 @@
                CC3DC89B0A7CDB9600B53F32 /* ApplicationServices.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = ApplicationServices.framework; path = /System/Library/Frameworks/ApplicationServices.framework; sourceTree = "<absolute>"; };
                CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = AppleRemote.h; path = ../../modules/gui/macosx/AppleRemote.h; sourceTree = SOURCE_ROOT; };
                CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AppleRemote.m; path = ../../modules/gui/macosx/AppleRemote.m; sourceTree = SOURCE_ROOT; };
+               CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = embeddedwindow.h; path = ../../modules/gui/macosx/embeddedwindow.h; sourceTree = SOURCE_ROOT; };
+               CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = embeddedwindow.m; path = ../../modules/gui/macosx/embeddedwindow.m; sourceTree = SOURCE_ROOT; };
                CCF3C64B0923B99D00401862 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = Resources/English.lproj/SFilters.nib; sourceTree = "<group>"; };
                CCF3C6500923B9D100401862 /* sfilters.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = sfilters.h; path = ../../modules/gui/macosx/sfilters.h; sourceTree = SOURCE_ROOT; };
                CCF3C6510923B9D100401862 /* sfilters.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; name = sfilters.m; path = ../../modules/gui/macosx/sfilters.m; sourceTree = SOURCE_ROOT; };
@@ -1100,6 +1102,8 @@
                                CC26BF3209A7A08C00E94D62 /* update.m */,
                                CC6D8D9C0A878DED006F2BBE /* AppleRemote.h */,
                                CC6D8D9D0A878DED006F2BBE /* AppleRemote.m */,
+                               CCC593780AB4A9FB0004FF52 /* embeddedwindow.h */,
+                               CCC593790AB4A9FB0004FF52 /* embeddedwindow.m */,
                                2AEF857609A5FEC900130822 /* fspanel.h */,
                                2AEF857709A5FEC900130822 /* fspanel.m */,
                        );

diff --git a/modules/gui/macosx/controls.m b/modules/gui/macosx/controls.m
index 2379f988df54504be5fd475eadef0829c5ce07cb..1ac699b5d7243c7bc01634a846b6fd82bea44051 100644 (file)
--- a/modules/gui/macosx/controls.m
+++ b/modules/gui/macosx/controls.m
@@ -32,7 +32,6 @@
 #include <string.h>
 
 #include "intf.h"
-#include "fspanel.h"
 #include "vout.h"
 #include "open.h"
 #include "controls.h"

diff --git a/modules/gui/macosx/embeddedwindow.m b/modules/gui/macosx/embeddedwindow.m
index 4f3ca03871427c5e17bbca92f9e1510ebc373269..eb28ac833ff0dc017a74909878ebbd7a07037fd7 100644 (file)
--- a/modules/gui/macosx/embeddedwindow.m
+++ b/modules/gui/macosx/embeddedwindow.m
@@ -26,7 +26,6 @@
  *****************************************************************************/
 
 #include "intf.h"
-#include "fspanel.h"
 #include "vout.h"
 #include "embeddedwindow.h"
 

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index b6e68797e4e0ce531cfbdb30f4c57541dc89f144..fbc8516e20c282e5cc4e21b1f4bcd28f831529e9 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -146,7 +146,6 @@ struct intf_sys_t
     IBOutlet id o_msgs_btn_crashlog;    /* messages open crashlog */
 
     IBOutlet id o_info_window;  /* Info panel     */
-    IBOutlet id o_fs_panel;     /* Full screen panel*/
 
     /* main menu */