macosx: fixed playlist/video toggling and some memory leaks
[vlc.git] / modules / gui / macosx / intf.h
index cbbac88..c694ee0 100644 (file)
@@ -59,26 +59,13 @@ unsigned int CocoaKeyToVLC( unichar i_key );
 // You need to release those objects after use
 input_thread_t *getInput(void);
 vout_thread_t *getVout(void);
-aout_instance_t *getAout(void);
+audio_output_t *getAout(void);
 
 /*****************************************************************************
  * intf_sys_t: description and status of the interface
  *****************************************************************************/
 struct intf_sys_t
 {
-    /* special actions */
-    bool b_mute;
-    int i_play_status;
-
-    /* interface update */
-    bool b_intf_update;
-    bool b_playlist_update;
-    bool b_playmode_update;
-    bool b_current_title_update;
-    bool b_fullscreen_update;
-    bool b_volume_update;
-    bool b_intf_show;
-
     /* menus handlers */
     bool b_input_update;
     bool b_aout_update;
@@ -93,7 +80,6 @@ struct intf_sys_t
  *****************************************************************************/
 @class AppleRemote;
 @class VLCInformation;
-@class VLCControllerWindow;
 @class VLCEmbeddedWindow;
 @class VLCControls;
 @class VLCPlaylist;
@@ -107,7 +93,7 @@ struct intf_sys_t
     id o_wizard;                /* VLCWizard      */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_coredialogs;           /* VLCCoreDialogProvider */
-    VLCInformation * o_info;    /* VLCInformation */
+    id o_info;                  /* VLCInformation */
     id o_eyetv;                 /* VLCEyeTVController */
     id o_bookmarks;             /* VLCBookmarks */
     id o_coreinteraction;       /* VLCCoreInteraction */
@@ -119,32 +105,9 @@ struct intf_sys_t
     BOOL nib_info_loaded;       /* information panel nibfile */
     BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
     BOOL nib_bookmarks_loaded;   /* Bookmarks nibfile */
+    BOOL b_active_videoplayback;
 
-    IBOutlet VLCControllerWindow * o_window;                     /* main window */
-    IBOutlet id o_scrollfield;                                  /* info field */
-    IBOutlet NSTextField * o_timefield;                         /* time field */
-    IBOutlet NSSlider * o_timeslider;                                 /* time slider */
-    BOOL b_time_remaining;                                      /* show remaining time or playtime ? */
-    IBOutlet VLCEmbeddedWindow * o_embedded_window;             /* Embedded Vout Window */
-    float f_slider;                                             /* slider value */
-    float f_slider_old;                                         /* old slider val */
-    IBOutlet NSSlider * o_volumeslider;                         /* volume slider */
-
-    IBOutlet NSProgressIndicator * o_main_pgbar;   /* playlist window progress bar */
-    IBOutlet NSButton * o_btn_prev;     /* btn previous   */
-    IBOutlet NSButton * o_btn_rewind;   /* btn rewind     */
-    IBOutlet NSButton * o_btn_play;     /* btn play       */
-    IBOutlet NSButton * o_btn_stop;     /* btn stop       */
-    IBOutlet NSButton * o_btn_ff;       /* btn fast forward     */
-    IBOutlet NSButton * o_btn_next;     /* btn next       */
-    IBOutlet NSButton * o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
-    IBOutlet NSButton * o_btn_playlist; /* btn playlist   */
-    IBOutlet NSButton * o_btn_audioEffects; /* AudioEffects btn */
-
-    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_mainwindow;            /* VLCMainWindow */
 
     IBOutlet VLCControls * o_controls;     /* VLCControls    */
     IBOutlet VLCPlaylist * o_playlist;     /* VLCPlaylist    */
@@ -167,18 +130,8 @@ struct intf_sys_t
     IBOutlet NSButton * o_crashrep_includeEmail_ckb;
     IBOutlet NSTextField * o_crashrep_includeEmail_txt;
 
-    mtime_t i_end_scroll;
-
-    int     i_lastShownVolume;
-
     input_state_e cachedInputState;
 
-    /* the manage thread */
-    pthread_t manage_thread;
-
-    /* The timer that update the interface */
-    NSTimer * interfaceTimer;
-
     NSURLConnection * crashLogURLConnection;
 
     AppleRemote * o_remote;
@@ -204,16 +157,15 @@ struct intf_sys_t
 - (id)simplePreferences;
 - (id)preferences;
 - (id)playlist;
-- (BOOL)isPlaylistCollapsed;
 - (id)info;
 - (id)wizard;
 - (id)embeddedList;
 - (id)getVideoViewAtPositionX: (int *)pi_x Y: (int *)pi_y withWidth: (unsigned int*)pi_width andHeight: (unsigned int*)pi_height;
 - (id)coreDialogProvider;
-- (id)mainIntfPgbar;
-- (id)controllerWindow;
 - (id)eyeTVController;
 - (id)appleRemoteController;
+- (void)setActiveVideoPlayback:(BOOL)b_value;
+- (BOOL)activeVideoPlayback;
 - (void)applicationWillTerminate:(NSNotification *)notification;
 - (NSString *)localizedString:(const char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
@@ -222,29 +174,28 @@ struct intf_sys_t
 - (NSString *)VLCKeyToString:(NSString *)theString;
 - (unsigned int)VLCModifiersToCocoa:(NSString *)theString;
 - (void)updateCurrentlyUsedHotkeys;
-
+- (void)PlaylistItemChanged;
+- (void)playbackStatusUpdated;
+- (void)playbackModeUpdated;
+- (void)updateVolume;
+- (void)updatePlaybackPosition;
+- (void)updateName;
+- (void)playlistUpdated;
+- (void)updateInfoandMetaPanel;
+- (void)updateMainWindow;
+- (void)updateDelays;
 - (void)initStrings;
 - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename;
 
-- (void)manage;
-- (void)manageIntf:(NSTimer *)o_timer;
-
-- (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout;
-- (void)resetScrollField;
-
 - (void)updateMessageDisplay;
-- (void)playStatusUpdated:(int) i_status;
-- (void)manageVolumeSlider;
-- (IBAction)timesliderUpdate:(id)sender;
-- (IBAction)timeFieldWasClicked:(id)sender;
-- (IBAction)showController:(id)sender;
 
 - (IBAction)crashReporterAction:(id)sender;
 - (IBAction)openCrashLog:(id)sender;
 - (IBAction)saveDebugLog:(id)sender;
 - (IBAction)showMessagesPanel:(id)sender;
 
-- (IBAction)togglePlaylist:(id)sender;
+- (void)processReceivedlibvlcMessage:(const msg_item_t *)item;
+
 - (void)updateTogglePlaylistState;
 
 - (void)windowDidBecomeKey:(NSNotification *)o_notification;