Fix for the fullscreen button state (it is only enabled if a vout is present)

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index d3c4d578dc214f98e32a244269e084ea9ce20ad3..37acdeec06326c7d0a4b1239b8acb450dc7daad1 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,7 +2,7 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.h,v 1.36 2003/05/08 17:13:22 massiot Exp $
+ * $Id: intf.h,v 1.52 2003/12/15 19:25:56 bigben Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -35,14 +35,12 @@
  *****************************************************************************/
 @interface VLCApplication : NSApplication
 {
-    NSStringEncoding i_encoding;
     intf_thread_t *p_intf;
 }
 
-- (void)initIntlSupport;
 - (NSString *)localizedString:(char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
-- (NSStringEncoding)getEncoding;
+- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
 
 - (void)setIntf:(intf_thread_t *)p_intf;
 - (intf_thread_t *)getIntf;
@@ -56,6 +54,9 @@
 #define _ANS(s) [[NSApp localizedString: _(s)] substringFromIndex:2]
 
 int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
+int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
+                     vlc_value_t old_val, vlc_value_t new_val, void *param );
+unsigned int CocoaKeyToVLC( unichar i_key );
 
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
@@ -74,22 +75,15 @@ struct intf_sys_t
     vlc_bool_t b_play_status;
     vlc_bool_t b_playlist_update;
     vlc_bool_t b_current_title_update;
-    
+    vlc_bool_t b_fullscreen_update;
+
     /* menus handlers */
-    vlc_bool_t b_chapter_update;
-    vlc_bool_t b_program_update;
-    vlc_bool_t b_title_update;
-    vlc_bool_t b_audio_update;
-    vlc_bool_t b_video_update;
-    vlc_bool_t b_spu_update;
+    vlc_bool_t b_input_update;
     vlc_bool_t b_aout_update;
     vlc_bool_t b_vout_update;
 
     /* The messages window */
     msg_subscription_t * p_sub;
-
-    /* DVD mode */
-    unsigned int i_part;
 };
 
 /*****************************************************************************
@@ -100,23 +94,25 @@ struct intf_sys_t
     id o_prefs;                 /* VLCPrefs       */
 
     IBOutlet id o_window;       /* main window    */
+    IBOutlet id o_scrollfield;  /* info field     */
     IBOutlet id o_timefield;    /* time field     */
     IBOutlet id o_timeslider;   /* time slider    */
     float f_slider;             /* slider value   */
     float f_slider_old;         /* old slider val */ 
     IBOutlet id o_volumeslider; /* volume slider  */
 
-    IBOutlet id o_btn_playlist; /* btn playlist   */
     IBOutlet id o_btn_prev;     /* btn previous   */
-    IBOutlet id o_btn_slower;   /* btn slower     */
+    IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */
     IBOutlet id o_btn_stop;     /* btn stop       */
-    IBOutlet id o_btn_faster;   /* btn faster     */
+    IBOutlet id o_btn_ff;       /* btn fast forward     */
     IBOutlet id o_btn_next;     /* btn next       */
-    IBOutlet id o_btn_prefs;    /* btn prefs      */
+    IBOutlet id o_btn_fullscreen;/* btn fullscreen      */
 
     NSImage * o_img_play;       /* btn play img   */
     NSImage * o_img_pause;      /* btn pause img  */
+    NSImage * o_img_play_pressed;       /* btn play img   */
+    NSImage * o_img_pause_pressed;      /* btn pause img  */
 
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
@@ -168,6 +164,8 @@ struct intf_sys_t
     IBOutlet id o_mi_slower;
     IBOutlet id o_mi_previous;
     IBOutlet id o_mi_next;
+    IBOutlet id o_mi_random;
+    IBOutlet id o_mi_repeat;
     IBOutlet id o_mi_loop;
     IBOutlet id o_mi_fwd;
     IBOutlet id o_mi_bwd;
@@ -188,6 +186,8 @@ struct intf_sys_t
     IBOutlet id o_mu_channels;
     IBOutlet id o_mi_device;
     IBOutlet id o_mu_device;
+    IBOutlet id o_mi_visual;
+    IBOutlet id o_mu_visual;
 
     IBOutlet id o_mu_video;
     IBOutlet id o_mi_half_window;
@@ -216,6 +216,7 @@ struct intf_sys_t
     
     IBOutlet id o_mu_help;
     IBOutlet id o_mi_readme;
+    IBOutlet id o_mi_documentation;
     IBOutlet id o_mi_reportabug;
     IBOutlet id o_mi_website;
     IBOutlet id o_mi_license;
@@ -228,35 +229,28 @@ struct intf_sys_t
 }
 
 - (id)getControls;
-
+- (id)getPlaylist;
 - (void)terminate;
 
+- (void)initStrings;
+
 - (void)manage;
-- (void)manage:(playlist_t *)p_playlist;
-- (void)manageMode:(playlist_t *)p_playlist;
 - (void)manageIntf:(NSTimer *)o_timer;
+- (void)setupMenus;
 
 - (void)updateMessageArray;
 - (void)playStatusUpdated:(BOOL)b_pause;
 - (void)setSubmenusEnabled:(BOOL)b_enabled;
 - (void)manageVolumeSlider;
-
-- (void)setupMenus:(input_thread_t *)p_input;
-- (void)setupVarMenu:(NSMenuItem *)o_mi
-                     target:(vlc_object_t *)p_object
-                     var:(const char *)psz_var
-                     selector:(SEL)pf_callback;
+- (IBAction)timesliderUpdate:(id)sender;
 
 - (IBAction)clearRecentItems:(id)sender;
 - (void)openRecentItem:(id)sender;
 
 - (IBAction)viewPreferences:(id)sender;
-
-- (IBAction)timesliderUpdate:(id)sender;
-
 - (IBAction)closeError:(id)sender;
-
 - (IBAction)openReadMe:(id)sender;
+- (IBAction)openDocumentation:(id)sender;
 - (IBAction)reportABug:(id)sender;
 - (IBAction)openWebsite:(id)sender;
 - (IBAction)openLicense:(id)sender;