Mac OS X gui: Rework VLCVoutWindow behaviour when macosx-black is set. (Pointed by...

[vlc] / modules / gui / macosx / intf.h

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index b6e68797e4e0ce531cfbdb30f4c57541dc89f144..08af1b786c1b7acaf924201b4dea542574052496 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -25,10 +25,11 @@
  *****************************************************************************/
 
 #include <vlc/vlc.h>
-#include <vlc/intf.h>
-#include <vlc/vout.h>
-#include <vlc/aout.h>
-#include <vlc/input.h>
+#include <vlc_interface.h>
+#include <vlc_playlist.h>
+#include <vlc_vout.h>
+#include <vlc_aout.h>
+#include <vlc_input.h>
 
 #include <Cocoa/Cocoa.h>
 
@@ -50,6 +51,9 @@ unsigned int CocoaKeyToVLC( unichar i_key );
             @"/System/Library/CoreServices/SystemVersion.plist"] \
             objectForKey: @"ProductVersion"] floatValue]
 
+/* switch this to 1, if you want to use Obj-C with GC */
+#define GC_ENABLED 0
+
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/
@@ -146,7 +150,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 */
 
@@ -286,6 +289,7 @@ struct intf_sys_t
     int     i_lastShownVolume;
 
     AppleRemote * o_remote;
+    BOOL b_remote_button_hold; /* true as long as the user holds the left,right,plus or minus on the remote control */
 }
 
 + (VLCMain *)sharedInstance;
@@ -314,6 +318,7 @@ struct intf_sys_t
 - (void)manage;
 - (void)manageIntf:(NSTimer *)o_timer;
 - (void)setupMenus;
+- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
 - (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout;
 - (void)resetScrollField;