* include/vlc_keys.h: added StringToKey()

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 697c80d3d8bde6f63734560ba74a45145e8d48c3..9c328132c2e2ab3445a888c1dd74ac25d90cc136 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.35 2003/05/08 01:16:57 hartman Exp $
+ * $Id: intf.h,v 1.48 2003/11/11 23:50:41 hartman 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
@@ -76,20 +77,12 @@ struct intf_sys_t
     vlc_bool_t b_current_title_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;
 };
 
 /*****************************************************************************
@@ -168,20 +161,30 @@ 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;
     IBOutlet id o_mi_program;
+    IBOutlet id o_mu_program;
     IBOutlet id o_mi_title;
+    IBOutlet id o_mu_title;
     IBOutlet id o_mi_chapter;
+    IBOutlet id o_mu_chapter;
 
     IBOutlet id o_mu_audio;
     IBOutlet id o_mi_vol_up;
     IBOutlet id o_mi_vol_down;
     IBOutlet id o_mi_mute;
     IBOutlet id o_mi_audiotrack;
+    IBOutlet id o_mu_audiotrack;
     IBOutlet id o_mi_channels;
+    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;
@@ -191,8 +194,11 @@ struct intf_sys_t
     IBOutlet id o_mi_fullscreen;
     IBOutlet id o_mi_floatontop;
     IBOutlet id o_mi_videotrack;
+    IBOutlet id o_mu_videotrack;
     IBOutlet id o_mi_screen;
+    IBOutlet id o_mu_screen;
     IBOutlet id o_mi_subtitle;
+    IBOutlet id o_mu_subtitle;
     IBOutlet id o_mi_deinterlace;
     IBOutlet id o_mu_deinterlace;
 
@@ -207,6 +213,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;
@@ -219,35 +226,27 @@ struct intf_sys_t
 }
 
 - (id)getControls;
-
 - (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;