* ./modules/gui/macosx/intf.[mh]: Fixed message panel memory leak. Textview

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 81226c57ef903f72e98b6fcb64f8e74cd7012ea0..42ff7d8a8f29e99de6b1667aea13682928726e3d 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -2,10 +2,11 @@
  * intf.h: MacOS X interface plugin
  *****************************************************************************
  * Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.2 2002/10/02 22:56:53 massiot Exp $
+ * $Id: intf.h,v 1.18 2003/01/27 00:08:31 jlj Exp $
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
+ *          Derk-Jan Hartman <thedj@users.sourceforge.net>
  *
  * 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
@@ -58,6 +59,7 @@ struct intf_sys_t
     /* special actions */
     vlc_bool_t b_loop;
     vlc_bool_t b_playing;
+    vlc_bool_t b_stopping;
     vlc_bool_t b_mute;
 
     /* menus handlers */
@@ -66,6 +68,8 @@ struct intf_sys_t
     vlc_bool_t b_title_update;
     vlc_bool_t b_audio_update;
     vlc_bool_t b_spu_update;
+    vlc_bool_t b_aout_update;
+    vlc_bool_t b_vout_update;
 
     /* The input thread */
     input_thread_t * p_input;
@@ -74,7 +78,7 @@ struct intf_sys_t
     msg_subscription_t * p_sub;
 
     /* DVD mode */
-    int i_part;
+    unsigned int i_part;
 };
 
 /*****************************************************************************
@@ -82,7 +86,23 @@ struct intf_sys_t
  *****************************************************************************/
 @interface VLCMain : NSObject
 {
+    id o_prefs;                 /* VLCPrefs       */
+
     IBOutlet id o_window;       /* main window    */
+    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_slowmotion;   /* btn slowmotion     */
+    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_next;     /* btn next       */
+    IBOutlet id o_btn_prefs;    /* btn prefs      */
 
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
@@ -90,10 +110,20 @@ struct intf_sys_t
     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     */
+    IBOutlet id o_err_lbl;
+    IBOutlet id o_err_bug_lbl;
+    IBOutlet id o_err_btn_msgs; /* Open Messages  */
+    IBOutlet id o_err_btn_dismiss;
 
     /* main menu */
 
     IBOutlet id o_mi_about;
+    IBOutlet id o_mi_prefs;
     IBOutlet id o_mi_hide;
     IBOutlet id o_mi_hide_others;
     IBOutlet id o_mi_show_all;
@@ -101,9 +131,9 @@ struct intf_sys_t
 
     IBOutlet id o_mu_file;
     IBOutlet id o_mi_open_file;
+    IBOutlet id o_mi_open_generic;
     IBOutlet id o_mi_open_disc;
     IBOutlet id o_mi_open_net;
-    IBOutlet id o_mi_open_quickly;
     IBOutlet id o_mi_open_recent;
     IBOutlet id o_mi_open_recent_cm;
 
@@ -114,57 +144,83 @@ struct intf_sys_t
     IBOutlet id o_mi_clear;
     IBOutlet id o_mi_select_all;
 
-    IBOutlet id o_mu_view;
-    IBOutlet id o_mi_playlist;
-    IBOutlet id o_mi_messages;
-
     IBOutlet id o_mu_controls;
     IBOutlet id o_mi_play;
-    IBOutlet id o_mi_pause;
     IBOutlet id o_mi_stop;
     IBOutlet id o_mi_faster;
     IBOutlet id o_mi_slower;
     IBOutlet id o_mi_previous;
     IBOutlet id o_mi_next;
     IBOutlet id o_mi_loop;
-    IBOutlet id o_mi_vol_up;
-    IBOutlet id o_mi_vol_down;
-    IBOutlet id o_mi_mute;
-    IBOutlet id o_mi_fullscreen;
-    IBOutlet id o_mi_deinterlace;
     IBOutlet id o_mi_program;
     IBOutlet id o_mi_title;
     IBOutlet id o_mi_chapter;
     IBOutlet id o_mi_language;
     IBOutlet id o_mi_subtitle;
 
+    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_channels;
+    IBOutlet id o_mi_device;
+
+    IBOutlet id o_mu_video;
+    IBOutlet id o_mi_fullscreen;
+    IBOutlet id o_mi_screen;
+    IBOutlet id o_mi_deinterlace;
+
     IBOutlet id o_mu_window;
     IBOutlet id o_mi_minimize;
+    IBOutlet id o_mi_close_window;
+    IBOutlet id o_mi_controller;
+    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;
-    IBOutlet id o_dmi_pause;
     IBOutlet id o_dmi_stop;
-
-    id asystm;                 // MacOSXAudioSystem
 }
 
 - (void)terminate;
 
 - (void)manage;
 - (void)manageMode;
+- (void)setControlItems;
 
 - (void)setupMenus;
 - (void)setupLangMenu:(NSMenuItem *)o_mi
                       es:(es_descriptor_t *)p_es
                       category:(int)i_cat
                       selector:(SEL)pf_callback;
+- (void)setupVarMenu:(NSMenuItem *)o_mi
+                     target:(vlc_object_t *)p_object
+                     var:(const char *)psz_var
+                     selector:(SEL)pf_callback;
 
 - (IBAction)clearRecentItems:(id)sender;
 - (void)openRecentItem:(id)sender;
 
-//- (void)selectAction:(id)sender;
+- (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