Mac OS X gui: Nicely keep the controller window on screen when opening the playlist...

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 21d3131f8abd8452a517f6e76a754293c0baf686..0f347f6a844292a87077c03b19e3778ca3021db2 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -7,6 +7,7 @@
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <hartman at videolan dot org>
+ *          Felix K\9fhne <fkuehne at videolan dot org>
  *
  * 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
@@ -24,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>
 
@@ -49,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
  *****************************************************************************/
@@ -100,6 +105,7 @@ struct intf_sys_t
     id o_interaction_list;      /* VLCInteractionList*/
     id o_sfilters;              /* VLCsFilters    */
     id o_update;                /* VLCUpdate      */
+    id o_eyetv;                 /* VLCEyeTVController */
     BOOL nib_main_loaded;       /* reference to the main-nib */
     BOOL nib_open_loaded;       /* reference to the open-nib */
     BOOL nib_about_loaded;      /* reference to the about-nib */
@@ -119,6 +125,7 @@ struct intf_sys_t
     float f_slider_old;         /* old slider val */
     IBOutlet id o_volumeslider; /* volume slider  */
 
+    IBOutlet id o_main_pgbar;   /* main interface progress bar */
     IBOutlet id o_btn_prev;     /* btn previous   */
     IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */
@@ -143,14 +150,6 @@ struct intf_sys_t
     NSLock * o_msg_lock;        /* messages lock  */
     IBOutlet id o_msgs_btn_crashlog;    /* messages open crashlog */
 
-    IBOutlet id o_error;        /* error panel    */
-    IBOutlet id o_err_msg;      /* NSTextView     */
-    IBOutlet id o_err_lbl;
-    IBOutlet id o_err_bug_lbl;
-    IBOutlet id o_err_btn_msgs; /* Open Messages  */
-    IBOutlet id o_err_btn_dismiss;
-    IBOutlet id o_err_ckbk_surpress;
-
     IBOutlet id o_info_window;  /* Info panel     */
 
     /* main menu */
@@ -261,6 +260,7 @@ struct intf_sys_t
     IBOutlet id o_mi_license;
     IBOutlet id o_mi_donation;
     IBOutlet id o_mi_forum;
+    IBOutlet id o_mi_errorsAndWarnings;
 
     /* dock menu */
     IBOutlet id o_dmi_play;
@@ -269,8 +269,23 @@ struct intf_sys_t
     IBOutlet id o_dmi_previous;
     IBOutlet id o_dmi_mute;
 
+    /* vout menu */
+    IBOutlet id o_vout_menu;
+    IBOutlet id o_vmi_play;
+    IBOutlet id o_vmi_stop;
+    IBOutlet id o_vmi_prev;
+    IBOutlet id o_vmi_next;
+    IBOutlet id o_vmi_volup;
+    IBOutlet id o_vmi_voldown;
+    IBOutlet id o_vmi_mute;
+    IBOutlet id o_vmi_fullscreen;
+    IBOutlet id o_vmi_snapshot;
+
     bool b_small_window;
 
+    bool b_restore_size;
+    NSRect o_restore_rect;
+
     mtime_t i_end_scroll;
 
     NSSize o_size_with_playlist;
@@ -278,6 +293,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;
@@ -292,7 +308,11 @@ struct intf_sys_t
 - (id)getBookmarks;
 - (id)getEmbeddedList;
 - (id)getInteractionList;
-- (void)terminate;
+- (id)getMainIntfPgbar;
+- (id)getControllerWindow;
+- (id)getVoutMenu;
+- (id)getEyeTVController;
+- (void)applicationWillTerminate:(NSNotification *)notification;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
 - (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
@@ -303,6 +323,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;
 
@@ -328,7 +349,6 @@ struct intf_sys_t
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)checkForUpdate:(id)sender;
-- (IBAction)closeError:(id)sender;
 - (IBAction)openReadMe:(id)sender;
 - (IBAction)openDocumentation:(id)sender;
 - (IBAction)reportABug:(id)sender;
@@ -337,6 +357,8 @@ struct intf_sys_t
 - (IBAction)openForum:(id)sender;
 - (IBAction)openDonate:(id)sender;
 - (IBAction)openCrashLog:(id)sender;
+- (IBAction)viewErrorsAndWarnings:(id)sender;
+- (IBAction)showMessagesPanel:(id)sender;
 
 - (IBAction)togglePlaylist:(id)sender;
 - (void)updateTogglePlaylistState;