X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=c51bc3579b5a252d7ece51343a1836ec188315ff;hb=509ed543963645d4e73b1d4290ccd612477f8cca;hp=9e029a09611b07017815e4c74a397699c81f789a;hpb=9778299925be8173a290893bce9112fd7e06d54b;p=vlc

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 9e029a0961..c51bc3579b 100644
--- 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-2005 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
@@ -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
  *****************************************************************************/
@@ -66,6 +70,7 @@ struct intf_sys_t
     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;
 
     /* menus handlers */
     vlc_bool_t b_input_update;
@@ -85,7 +90,14 @@ struct intf_sys_t
     id o_prefs;                 /* VLCPrefs       */
     id o_about;                 /* VLAboutBox     */
     id o_open;                  /* VLCOpen        */
+    id o_wizard;                /* VLCWizard      */
+    id o_extended;              /* VLCExtended    */
+    id o_bookmarks;             /* VLCBookmarks   */
     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 */ 
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -149,6 +161,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;
@@ -217,6 +230,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;
@@ -242,6 +257,7 @@ struct intf_sys_t
 
     NSSize o_size_with_playlist;
 
+    int     i_lastShownVolume;
 }
 
 + (VLCMain *)sharedInstance;
@@ -252,6 +268,8 @@ struct intf_sys_t
 - (id)getControls;
 - (id)getPlaylist;
 - (id)getInfo;
+- (id)getWizard;
+- (id)getBookmarks;
 - (void)terminate;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
@@ -280,6 +298,10 @@ 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)viewAbout:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)closeError:(id)sender;