/*****************************************************************************
* intf.h: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2008 the VideoLAN team
+ * Copyright (C) 2002-2009 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*****************************************************************************/
unsigned int CocoaKeyToVLC( unichar i_key );
-#define VLCIntf [[VLCMain sharedInstance] getIntf]
+#define VLCIntf [[VLCMain sharedInstance] intf]
#define _NS(s) [[VLCMain sharedInstance] localizedString: _(s)]
/* Get an alternate version of the string.
@"/System/Library/CoreServices/SystemVersion.plist"] \
objectForKey: @"ProductVersion"] floatValue]
+
+// You need to release those objects after use
+input_thread_t *getInput(void);
+vout_thread_t *getVout(void);
+aout_instance_t *getAout(void);
+
/*****************************************************************************
* intf_sys_t: description and status of the interface
*****************************************************************************/
struct intf_sys_t
{
- NSAutoreleasePool * o_pool;
-
/* special actions */
bool b_mute;
int i_play_status;
*****************************************************************************/
@class AppleRemote;
@class VLCInformation;
-@class VLControllerWindow;
+@class VLCControllerWindow;
@class VLCEmbeddedWindow;
@class VLCControls;
@class VLCPlaylist;
id o_wizard; /* VLCWizard */
id o_extended; /* VLCExtended */
id o_bookmarks; /* VLCBookmarks */
- id o_vlm; /* VLCVLMController */
id o_embedded_list; /* VLCEmbeddedList*/
- id o_interaction_list; /* VLCInteractionList*/
- VLCInformation * o_info; /* VLCInformation */
-#ifdef UPDATE_CHECK
- id o_update; /* VLCUpdate */
-#endif
+ id o_coredialogs; /* VLCCoreDialogProvider */
+ VLCInformation * o_info; /* VLCInformation */
id o_eyetv; /* VLCEyeTVController */
BOOL nib_main_loaded; /* main nibfile */
BOOL nib_open_loaded; /* open nibfile */
BOOL nib_extended_loaded; /* extended nibfile */
BOOL nib_bookmarks_loaded; /* bookmarks nibfile */
BOOL nib_prefs_loaded; /* preferences nibfile */
- BOOL nib_update_loaded; /* update nibfile */
BOOL nib_info_loaded; /* information panel nibfile */
- BOOL nib_vlm_loaded; /* VLM Panel nibfile */
-
- IBOutlet VLControllerWindow * o_window; /* main window */
- IBOutlet NSView * o_playlist_view;/* playlist view */
- IBOutlet id o_scrollfield; /* info field */
- IBOutlet NSTextField * o_timefield; /* time field */
- IBOutlet NSSlider * o_timeslider; /* time slider */
- 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 */
+ BOOL nib_coredialogs_loaded; /* CoreDialogs nibfile */
+
+ IBOutlet VLCControllerWindow * o_window; /* main window */
+ IBOutlet NSView * o_playlist_view; /* playlist view */
+ 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 NSView * toolbarMediaControl; /* view with the controls */
IBOutlet VLCControls * o_controls; /* VLCControls */
IBOutlet VLCPlaylist * o_playlist; /* VLCPlaylist */
- IBOutlet id o_messages; /* messages tv */
- IBOutlet id o_msgs_panel; /* messages panel */
- NSMutableArray * o_msg_arr; /* messages array */
- NSLock * o_msg_lock; /* messages lock */
- IBOutlet NSButton * o_msgs_btn_crashlog; /* messages open crashlog */
-
+ IBOutlet NSTextView * o_messages; /* messages tv */
+ IBOutlet NSWindow * o_msgs_panel; /* messages panel */
+ NSMutableArray * o_msg_arr; /* messages array */
+ NSLock * o_msg_lock; /* messages lock */
+ BOOL b_msg_arr_changed; /* did the array change? */
+ IBOutlet NSButton * o_msgs_crashlog_btn; /* messages open crashlog */
+ IBOutlet NSButton * o_msgs_save_btn; /* save the log as rtf */
+
/* CrashReporter panel */
IBOutlet NSButton * o_crashrep_dontSend_btn;
IBOutlet NSButton * o_crashrep_send_btn;
IBOutlet NSMenuItem * o_mi_open_recent;
IBOutlet NSMenuItem * o_mi_open_recent_cm;
IBOutlet NSMenuItem * o_mi_open_wizard;
- IBOutlet NSMenuItem * o_mi_open_vlm;
IBOutlet NSMenu * o_mu_edit;
IBOutlet NSMenuItem * o_mi_cut;
IBOutlet NSMenuItem * o_mi_stop;
IBOutlet NSMenuItem * o_mi_faster;
IBOutlet NSMenuItem * o_mi_slower;
+ IBOutlet NSMenuItem * o_mi_normalSpeed;
IBOutlet NSMenuItem * o_mi_previous;
IBOutlet NSMenuItem * o_mi_next;
IBOutlet NSMenuItem * o_mi_random;
IBOutlet NSMenuItem * o_mi_repeat;
IBOutlet NSMenuItem * o_mi_loop;
+ IBOutlet NSMenuItem * o_mi_quitAfterPB;
IBOutlet NSMenuItem * o_mi_fwd;
IBOutlet NSMenuItem * o_mi_bwd;
IBOutlet NSMenuItem * o_mi_fwd1m;
IBOutlet NSMenuItem * o_mi_fwd5m;
IBOutlet NSMenuItem * o_mi_bwd5m;
IBOutlet NSMenuItem * o_mi_program;
- IBOutlet NSMenuItem * o_mu_program;
+ IBOutlet NSMenu * o_mu_program;
IBOutlet NSMenuItem * o_mi_title;
IBOutlet NSMenu * o_mu_title;
IBOutlet NSMenuItem * o_mi_chapter;
IBOutlet NSMenu * o_mu_crop;
IBOutlet NSMenuItem * o_mi_subtitle;
IBOutlet NSMenu * o_mu_subtitle;
+ IBOutlet NSMenuItem * o_mi_addSub;
IBOutlet NSMenuItem * o_mi_deinterlace;
IBOutlet NSMenu * o_mu_deinterlace;
IBOutlet NSMenuItem * o_mi_ffmpeg_pp;
- IBOutlet NSMenuItem * o_mu_ffmpeg_pp;
+ IBOutlet NSMenu * o_mu_ffmpeg_pp;
IBOutlet NSMenuItem * o_mi_teletext;
IBOutlet NSMenuItem * o_mi_teletext_transparent;
IBOutlet NSMenuItem * o_mi_teletext_index;
IBOutlet NSMenu * o_mu_window;
IBOutlet NSMenuItem * o_mi_minimize;
IBOutlet NSMenuItem * o_mi_close_window;
+ IBOutlet NSMenuItem * o_mi_player;
IBOutlet NSMenuItem * o_mi_controller;
IBOutlet NSMenuItem * o_mi_equalizer;
IBOutlet NSMenuItem * o_mi_extended;
+ (VLCMain *)sharedInstance;
-- (intf_thread_t *)getIntf;
+- (intf_thread_t *)intf;
- (void)setIntf:(intf_thread_t *)p_mainintf;
- (void)controlTintChanged;
-- (id)getControls;
-- (id)getSimplePreferences;
-- (id)getPreferences;
-- (id)getPlaylist;
+- (id)controls;
+- (id)simplePreferences;
+- (id)preferences;
+- (id)playlist;
- (BOOL)isPlaylistCollapsed;
-- (id)getInfo;
-- (id)getWizard;
-- (id)getBookmarks;
-- (id)getEmbeddedList;
-- (id)getInteractionList;
-- (id)getMainIntfPgbar;
-- (id)getControllerWindow;
-- (id)getVoutMenu;
-- (id)getEyeTVController;
+- (id)info;
+- (id)wizard;
+- (id)bookmarks;
+- (id)embeddedList;
+- (id)coreDialogProvider;
+- (id)mainIntfPgbar;
+- (id)controllerWindow;
+- (id)voutMenu;
+- (id)eyeTVController;
+- (id)appleRemoteController;
- (void)applicationWillTerminate:(NSNotification *)notification;
- (NSString *)localizedString:(const char *)psz;
- (char *)delocalizeString:(NSString *)psz;
- (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout;
- (void)resetScrollField;
-- (void)updateMessageArray;
+- (void)updateMessageDisplay;
- (void)playStatusUpdated:(int) i_status;
- (void)setSubmenusEnabled:(BOOL)b_enabled;
- (void)manageVolumeSlider;
- (IBAction)timesliderUpdate:(id)sender;
+- (IBAction)timeFieldWasClicked:(id)sender;
- (IBAction)clearRecentItems:(id)sender;
- (void)openRecentItem:(id)sender;
- (IBAction)intfOpenCapture:(id)sender;
- (IBAction)showWizard:(id)sender;
-- (IBAction)showVLM:(id)sender;
- (IBAction)showExtended:(id)sender;
- (IBAction)showBookmarks:(id)sender;
- (IBAction)viewAbout:(id)sender;
- (IBAction)showLicense:(id)sender;
- (IBAction)viewPreferences:(id)sender;
-- (IBAction)checkForUpdate:(id)sender;
- (IBAction)viewHelp:(id)sender;
- (IBAction)openReadMe:(id)sender;
- (IBAction)openDocumentation:(id)sender;
- (IBAction)showInformationPanel:(id)sender;
- (IBAction)crashReporterAction:(id)sender;
+- (IBAction)saveDebugLog:(id)sender;
- (IBAction)togglePlaylist:(id)sender;
- (void)updateTogglePlaylistState;
@interface VLCMain (Internal)
- (void)handlePortMessage:(NSPortMessage *)o_msg;
@end
+
+/*****************************************************************************
+ * VLCApplication interface
+ *****************************************************************************/
+
+@interface VLCApplication : NSApplication
+{
+ BOOL b_justJumped;
+ BOOL b_mediaKeySupport;
+ BOOL b_activeInBackground;
+ BOOL b_active;
+}
+
+- (void)coreChangedMediaKeySupportSetting: (NSNotification *)o_notification;
+- (void)sendEvent: (NSEvent*)event;
+- (void)resetJump;
+
+@end
projects / vlc / blobdiff