* implemented a non-blocking progress-bar in the main interface; needs testing (close...

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index c63b52a1bfe8ce28ef5b2a9dcf9248a0ea782ec4..df19aeda934cac7c57b77f9ff7d70b98e957bc90 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -1,7 +1,7 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2005 VideoLAN
+ * Copyright (C) 2002-2006 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -20,7 +20,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #include <vlc/vlc.h>
@@ -45,6 +45,10 @@ unsigned int CocoaKeyToVLC( unichar i_key );
  * the translated string. the translation should be '1:translatedstring' though */
 #define _ANS(s) [[[VLCMain sharedInstance] localizedString: _(s)] substringFromIndex:2]
 
+#define MACOS_VERSION [[[NSDictionary dictionaryWithContentsOfFile: \
+            @"/System/Library/CoreServices/SystemVersion.plist"] \
+            objectForKey: @"ProductVersion"] floatValue]
+
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/
@@ -63,8 +67,11 @@ struct intf_sys_t
     /* interface update */
     vlc_bool_t b_intf_update;
     vlc_bool_t b_playlist_update;
+    vlc_bool_t b_playmode_update;
     vlc_bool_t b_current_title_update;
     vlc_bool_t b_fullscreen_update;
+    vlc_bool_t b_volume_update;
+    vlc_bool_t b_intf_show;
 
     /* menus handlers */
     vlc_bool_t b_input_update;
@@ -73,28 +80,46 @@ struct intf_sys_t
 
     /* The messages window */
     msg_subscription_t * p_sub;
+
 };
 
 /*****************************************************************************
  * VLCMain interface
  *****************************************************************************/
+@class AppleRemote;
 @interface VLCMain : NSObject
 {
     intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
     id o_about;                 /* VLAboutBox     */
     id o_open;                  /* VLCOpen        */
+    id o_wizard;                /* VLCWizard      */
+    id o_extended;              /* VLCExtended    */
+    id o_bookmarks;             /* VLCBookmarks   */
+    id o_embedded_list;         /* VLCEmbeddedList*/
+    id o_interaction_list;      /* VLCInteractionList*/
+    id o_sfilters;              /* VLCsFilters    */
+    id o_update;                /* VLCUpdate      */
+    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 */
+    BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
+    BOOL nib_extended_loaded;   /* reference to the extended-nib */
+    BOOL nib_bookmarks_loaded;  /* reference to the bookmarks-nib */
+    BOOL nib_sfilters_loaded;   /* reference to the sfilters-nib */
+    BOOL nib_update_loaded;     /* reference to the update-nib */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
     IBOutlet id o_scrollfield;  /* info field     */
     IBOutlet id o_timefield;    /* time field     */
     IBOutlet id o_timeslider;   /* time slider    */
+    IBOutlet id o_embedded_window; /* Embedded Vout Window */
     float f_slider;             /* slider value   */
     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       */
@@ -133,6 +158,7 @@ struct intf_sys_t
 
     IBOutlet id o_mi_about;
     IBOutlet id o_mi_prefs;
+    IBOutlet id o_mi_checkForUpdate;
     IBOutlet id o_mi_add_intf;
     IBOutlet id o_mu_add_intf;
     IBOutlet id o_mi_services;
@@ -148,6 +174,7 @@ struct intf_sys_t
     IBOutlet id o_mi_open_net;
     IBOutlet id o_mi_open_recent;
     IBOutlet id o_mi_open_recent_cm;
+    IBOutlet id o_mi_open_wizard;
 
     IBOutlet id o_mu_edit;
     IBOutlet id o_mi_cut;
@@ -204,6 +231,10 @@ struct intf_sys_t
     IBOutlet id o_mu_videotrack;
     IBOutlet id o_mi_screen;
     IBOutlet id o_mu_screen;
+    IBOutlet id o_mi_aspect_ratio;
+    IBOutlet id o_mu_aspect_ratio;
+    IBOutlet id o_mi_crop;
+    IBOutlet id o_mu_crop;
     IBOutlet id o_mi_subtitle;
     IBOutlet id o_mu_subtitle;
     IBOutlet id o_mi_deinterlace;
@@ -216,6 +247,8 @@ struct intf_sys_t
     IBOutlet id o_mi_close_window;
     IBOutlet id o_mi_controller;
     IBOutlet id o_mi_equalizer;
+    IBOutlet id o_mi_extended;
+    IBOutlet id o_mi_bookmarks;
     IBOutlet id o_mi_playlist;
     IBOutlet id o_mi_info;
     IBOutlet id o_mi_messages;
@@ -227,6 +260,8 @@ struct intf_sys_t
     IBOutlet id o_mi_reportabug;
     IBOutlet id o_mi_website;
     IBOutlet id o_mi_license;
+    IBOutlet id o_mi_donation;
+    IBOutlet id o_mi_forum;
 
     /* dock menu */
     IBOutlet id o_dmi_play;
@@ -241,6 +276,9 @@ struct intf_sys_t
 
     NSSize o_size_with_playlist;
 
+    int     i_lastShownVolume;
+
+    AppleRemote * o_remote;
 }
 
 + (VLCMain *)sharedInstance;
@@ -251,6 +289,13 @@ struct intf_sys_t
 - (id)getControls;
 - (id)getPlaylist;
 - (id)getInfo;
+- (id)getWizard;
+- (id)getBookmarks;
+- (id)getEmbeddedList;
+- (id)getInteractionList;
+- (id)getMainIntfPgbar;
+- (id)getMainScrollField;
+- (id)getControllerWindow;
 - (void)terminate;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
@@ -279,8 +324,14 @@ struct intf_sys_t
 - (IBAction)intfOpenDisc:(id)sender;
 - (IBAction)intfOpenNet:(id)sender;
 
+- (IBAction)showWizard:(id)sender;
+- (IBAction)showExtended:(id)sender;
+- (IBAction)showBookmarks:(id)sender;
+- (IBAction)showSFilters:(id)sender;
+
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
+- (IBAction)checkForUpdate:(id)sender;
 - (IBAction)closeError:(id)sender;
 - (IBAction)openReadMe:(id)sender;
 - (IBAction)openDocumentation:(id)sender;