* ./modules/gui/macosx: Defeated some deadlocks.

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index f86948e30412d88f3866394278cb19ad456390f5..a7c207a4fc725f34992cc1b46c5071c481981f4e 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 VideoLAN
- * $Id: intf.h,v 1.13 2003/01/16 13:49:44 hartman Exp $
+ * $Id: intf.h,v 1.20 2003/01/31 02:53:52 jlj Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
@@ -26,6 +26,7 @@
 #include <vlc/vlc.h>
 #include <vlc/intf.h>
 #include <vlc/vout.h>
+#include <vlc/aout.h>
 
 #include <Cocoa/Cocoa.h>
 
@@ -48,6 +49,8 @@
 
 #define _NS(s) [NSApp localizedString: _(s)]
 
+int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
+
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/
@@ -57,11 +60,13 @@ struct intf_sys_t
     NSPort * o_sendport;
 
     /* special actions */
-    vlc_bool_t b_loop;
     vlc_bool_t b_playing;
-    vlc_bool_t b_stopping;
     vlc_bool_t b_mute;
 
+    /* interface update */
+    vlc_bool_t b_intf_update;
+    vlc_bool_t b_play_status; 
+
     /* menus handlers */
     vlc_bool_t b_chapter_update;
     vlc_bool_t b_program_update;
@@ -71,9 +76,6 @@ struct intf_sys_t
     vlc_bool_t b_aout_update;
     vlc_bool_t b_vout_update;
 
-    /* The input thread */
-    input_thread_t * p_input;
-
     /* The messages window */
     msg_subscription_t * p_sub;
 
@@ -91,7 +93,6 @@ struct intf_sys_t
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_timefield;    /* time field     */
     IBOutlet id o_timeslider;   /* time slider    */
-    NSLock * o_slider_lock;     /* slider lock    */
     float f_slider;             /* slider value   */
     float f_slider_old;         /* old slider val */ 
     IBOutlet id o_volumeslider; /* volume slider  */
@@ -101,16 +102,21 @@ struct intf_sys_t
     IBOutlet id o_btn_slower;   /* btn slower     */
     IBOutlet id o_btn_play;     /* btn play       */
     IBOutlet id o_btn_stop;     /* btn stop       */
-    IBOutlet id o_btn_fastforward;   /* btn fastforward     */
+    IBOutlet id o_btn_faster;   /* btn faster     */
     IBOutlet id o_btn_next;     /* btn next       */
     IBOutlet id o_btn_prefs;    /* btn prefs      */
 
+    NSImage * o_img_play;       /* btn play img   */
+    NSImage * o_img_pause;      /* btn pause img  */
+
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
 
     IBOutlet id o_messages;     /* messages tv    */
     IBOutlet id o_msgs_panel;   /* messages panel */
     IBOutlet id o_msgs_btn_ok;  /* messages btn   */
+    NSMutableArray * o_msg_arr; /* messages array */
+    NSLock * o_msg_lock;        /* messages lock  */
 
     IBOutlet id o_error;        /* error panel    */
     IBOutlet id o_err_msg;      /* NSTextView     */
@@ -176,6 +182,12 @@ struct intf_sys_t
     IBOutlet id o_mi_playlist;
     IBOutlet id o_mi_messages;
     IBOutlet id o_mi_bring_atf;
+    
+    IBOutlet id o_mu_help;
+    IBOutlet id o_mi_readme;
+    IBOutlet id o_mi_reportabug;
+    IBOutlet id o_mi_website;
+    IBOutlet id o_mi_license;
 
     /* dock menu */
     IBOutlet id o_dmi_play;
@@ -185,10 +197,18 @@ struct intf_sys_t
 - (void)terminate;
 
 - (void)manage;
-- (void)manageMode;
-
-- (void)setupMenus;
-- (void)setupLangMenu:(NSMenuItem *)o_mi
+- (void)manage:(playlist_t *)p_playlist;
+- (void)manageMode:(playlist_t *)p_playlist;
+- (void)manageIntf:(NSTimer *)o_timer;
+
+- (void)updateMessageArray;
+- (void)playStatusUpdated:(BOOL)b_pause;
+- (void)setSubmenusEnabled:(BOOL)b_enabled;
+- (void)manageVolumeSlider;
+
+- (void)setupMenus:(input_thread_t *)p_input;
+- (void)setupLangMenu:(input_thread_t *)p_input
+                      mi:(NSMenuItem *)o_mi
                       es:(es_descriptor_t *)p_es
                       category:(int)i_cat
                       selector:(SEL)pf_callback;
@@ -203,10 +223,16 @@ struct intf_sys_t
 - (IBAction)viewPreferences:(id)sender;
 
 - (IBAction)timesliderUpdate:(id)sender;
-- (void)displayTime;
 
 - (IBAction)closeError:(id)sender;
 
+- (IBAction)openReadMe:(id)sender;
+- (IBAction)reportABug:(id)sender;
+- (IBAction)openWebsite:(id)sender;
+- (IBAction)openLicense:(id)sender;
+
+- (void)windowDidBecomeKey:(NSNotification *)o_notification;
+
 @end
 
 @interface VLCMain (Internal)