X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.h;h=8741d7cc30296ecd18e5c2a612e64911cb27ccf5;hb=2531d5144140a1b5ca3b13419c979c53e0c951ab;hp=3c65afecb76062e2768a845dd68001069c9892a4;hpb=b021f08d84b02f9ac672f5af74242d63a2cda970;p=vlc diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h index 3c65afecb7..8741d7cc30 100644 --- a/modules/gui/macosx/intf.h +++ b/modules/gui/macosx/intf.h @@ -42,7 +42,7 @@ *****************************************************************************/ 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. @@ -54,13 +54,17 @@ unsigned int CocoaKeyToVLC( unichar i_key ); @"/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; @@ -83,14 +87,12 @@ struct intf_sys_t msg_subscription_t * p_sub; }; -static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); - /***************************************************************************** * VLCMain interface *****************************************************************************/ @class AppleRemote; @class VLCInformation; -@class VLControllerWindow; +@class VLCControllerWindow; @class VLCEmbeddedWindow; @class VLCControls; @class VLCPlaylist; @@ -104,13 +106,12 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); id o_wizard; /* VLCWizard */ id o_extended; /* VLCExtended */ id o_bookmarks; /* VLCBookmarks */ +#ifdef ENABLE_VLM 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_embedded_list; /* VLCEmbeddedList*/ + id o_coredialogs; /* VLCCoreDialogProvider */ + VLCInformation * o_info; /* VLCInformation */ id o_eyetv; /* VLCEyeTVController */ BOOL nib_main_loaded; /* main nibfile */ BOOL nib_open_loaded; /* open nibfile */ @@ -119,19 +120,22 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); 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 */ +#ifdef ENABLE_VLM 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 */ +#endif + 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 */ @@ -209,11 +213,13 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); 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; @@ -221,7 +227,7 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); 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; @@ -262,7 +268,7 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); 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; @@ -274,6 +280,7 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); 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; @@ -339,25 +346,26 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); + (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; @@ -378,6 +386,7 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); - (void)setSubmenusEnabled:(BOOL)b_enabled; - (void)manageVolumeSlider; - (IBAction)timesliderUpdate:(id)sender; +- (IBAction)timeFieldWasClicked:(id)sender; - (IBAction)clearRecentItems:(id)sender; - (void)openRecentItem:(id)sender; @@ -396,7 +405,6 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); - (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; @@ -421,3 +429,21 @@ static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned ); @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