MacOSX intf work

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 7aa5f26394da25aa00c6a23ef501cc307da1d489..a9e639271bb21cbe76191cb719787526e669ed00 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -1,12 +1,12 @@
 /*****************************************************************************
- * intf.h: MacOS X interface plugin
+ * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.h,v 1.53 2003/12/22 14:32:56 sam Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
- *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          Derk-Jan Hartman <hartman 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
@@ -31,32 +31,18 @@
 #include <Cocoa/Cocoa.h>
 
 /*****************************************************************************
- * VLCApplication interface
+ * Local prototypes.
  *****************************************************************************/
-@interface VLCApplication : NSApplication
-{
-    intf_thread_t *p_intf;
-}
-
-- (NSString *)localizedString:(char *)psz;
-- (char *)delocalizeString:(NSString *)psz;
-- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
-
-- (void)setIntf:(intf_thread_t *)p_intf;
-- (intf_thread_t *)getIntf;
+int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
+unsigned int CocoaKeyToVLC( unichar i_key );
 
-@end
+#define VLCIntf [[VLCMain sharedInstance] getIntf]
 
-#define _NS(s) [NSApp localizedString: _(s)]
+#define _NS(s) [[VLCMain sharedInstance] localizedString: _(s)]
 /* Get an alternate version of the string.
  * This string is stored as '1:string' but when displayed it only displays
  * the translated string. the translation should be '1:translatedstring' though */
-#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 );
+#define _ANS(s) [[[VLCMain sharedInstance] localizedString: _(s)] substringFromIndex:2]
 
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
@@ -66,13 +52,16 @@ struct intf_sys_t
     NSAutoreleasePool * o_pool;
     NSPort * o_sendport;
 
+    /* the current input */
+    input_thread_t * p_input;
+
     /* special actions */
     vlc_bool_t b_playing;
     vlc_bool_t b_mute;
+    int i_play_status;
 
     /* interface update */
     vlc_bool_t b_intf_update;
-    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;
@@ -91,6 +80,7 @@ struct intf_sys_t
  *****************************************************************************/
 @interface VLCMain : NSObject
 {
+    intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
 
     IBOutlet id o_window;       /* main window    */
@@ -130,6 +120,7 @@ struct intf_sys_t
     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     */
 
@@ -137,6 +128,9 @@ struct intf_sys_t
 
     IBOutlet id o_mi_about;
     IBOutlet id o_mi_prefs;
+    IBOutlet id o_mi_add_intf;
+    IBOutlet id o_mu_add_intf;
+    IBOutlet id o_mi_services;
     IBOutlet id o_mi_hide;
     IBOutlet id o_mi_hide_others;
     IBOutlet id o_mi_show_all;
@@ -169,6 +163,10 @@ struct intf_sys_t
     IBOutlet id o_mi_loop;
     IBOutlet id o_mi_fwd;
     IBOutlet id o_mi_bwd;
+    IBOutlet id o_mi_fwd1m;
+    IBOutlet id o_mi_bwd1m;
+    IBOutlet id o_mi_fwd5m;
+    IBOutlet id o_mi_bwd5m;
     IBOutlet id o_mi_program;
     IBOutlet id o_mu_program;
     IBOutlet id o_mi_title;
@@ -226,11 +224,22 @@ struct intf_sys_t
     IBOutlet id o_dmi_stop;
     IBOutlet id o_dmi_next;
     IBOutlet id o_dmi_previous;
+    IBOutlet id o_dmi_mute;
 }
 
++ (VLCMain *)sharedInstance;
+
+- (intf_thread_t *)getIntf;
+- (void)setIntf:(intf_thread_t *)p_mainintf;
+
 - (id)getControls;
 - (id)getPlaylist;
+- (id)getInfo;
 - (void)terminate;
+- (NSString *)localizedString:(char *)psz;
+- (char *)delocalizeString:(NSString *)psz;
+- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
+- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event;
 
 - (void)initStrings;
 
@@ -239,7 +248,7 @@ struct intf_sys_t
 - (void)setupMenus;
 
 - (void)updateMessageArray;
-- (void)playStatusUpdated:(BOOL)b_pause;
+- (void)playStatusUpdated:(int) i_status;
 - (void)setSubmenusEnabled:(BOOL)b_enabled;
 - (void)manageVolumeSlider;
 - (IBAction)timesliderUpdate:(id)sender;