* intf.h: MacOS X interface plugin
*****************************************************************************
* Copyright (C) 2002 VideoLAN
- * $Id: intf.h,v 1.11 2003/01/05 16:23:57 massiot Exp $
+ * $Id: intf.h,v 1.21 2003/02/05 01:36:00 hartman 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
#include <vlc/vlc.h>
#include <vlc/intf.h>
#include <vlc/vout.h>
+#include <vlc/aout.h>
#include <Cocoa/Cocoa.h>
#define _NS(s) [NSApp localizedString: _(s)]
+int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
+
/*****************************************************************************
* intf_sys_t: description and status of the interface
*****************************************************************************/
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;
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;
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 */
IBOutlet id o_btn_playlist; /* btn playlist */
IBOutlet id o_btn_prev; /* btn previous */
IBOutlet id o_btn_slower; /* btn slower */
IBOutlet id o_btn_play; /* btn play */
- IBOutlet id o_btn_pause; /* btn pause */
IBOutlet id o_btn_stop; /* btn stop */
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 */
+ 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_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_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_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_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;
+ IBOutlet id o_dmi_next;
+ IBOutlet id o_dmi_previous;
}
- (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;
- (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