X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=a29375501958dc676b1e8c661a628e31b5542b8c;hb=1c7da3ea99ff73d0996d5256a1bc49b43a021b70;hp=fc3f576a7633004ba331db906e88bc7adeb07f5a;hpb=9940fc7b6a60808b3b261daf4a1c056e07b5792a;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index fc3f576a76..a293755019 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,12 +1,12 @@ /***************************************************************************** - * intf.m: MacOS X interface plugin + * intf.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2003 VideoLAN - * $Id: intf.m,v 1.67 2003/03/06 12:05:05 hartman Exp $ + * Copyright (C) 2002-2004 VideoLAN + * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot - * Derk-Jan Hartman + * Derk-Jan Hartman * * 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 @@ -29,12 +29,13 @@ #include /* malloc(), free() */ #include /* for MAXPATHLEN */ #include +#include #include "intf.h" #include "vout.h" #include "prefs.h" #include "playlist.h" -#include "info.h" +#include "controls.h" /***************************************************************************** * Local prototypes. @@ -55,20 +56,20 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) } memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) ); - + p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; - p_intf->p_sys->o_sendport = [[NSPort port] retain]; + /* Put Cocoa into multithread mode as soon as possible. + * http://developer.apple.com/techpubs/macosx/Cocoa/ + * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html + * This thread does absolutely nothing at all. */ + [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil]; + + p_intf->p_sys->o_sendport = [[NSPort port] retain]; p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); - + p_intf->b_play = VLC_TRUE; p_intf->pf_run = Run; - [[VLCApplication sharedApplication] autorelease]; - [NSApp initIntlSupport]; - [NSApp setIntf: p_intf]; - - [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; - return( 0 ); } @@ -78,14 +79,12 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) void E_(CloseIntf) ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; - + msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); - - config_SaveConfigFile( p_intf, MODULE_STRING ); - + [p_intf->p_sys->o_sendport release]; [p_intf->p_sys->o_pool release]; - + free( p_intf->p_sys ); } @@ -98,125 +97,26 @@ static void Run( intf_thread_t *p_intf ) * fails to go to real-time priority with the first launched thread * (???) --Meuuh */ vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); - + [[VLCMain sharedInstance] setIntf: p_intf]; + [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; [NSApp run]; + [[VLCMain sharedInstance] terminate]; } -/***************************************************************************** - * VLCApplication implementation - *****************************************************************************/ -@implementation VLCApplication - -- (id)init -{ - /* default encoding: ISO-8859-1 */ - i_encoding = NSISOLatin1StringEncoding; - - return( [super init] ); -} - -- (void)initIntlSupport -{ - char *psz_lang = getenv( "LANG" ); - - if( psz_lang == NULL ) - { - return; - } - - if( strncmp( psz_lang, "pl", 2 ) == 0 ) - { - i_encoding = NSISOLatin2StringEncoding; - } - else if( strncmp( psz_lang, "ja", 2 ) == 0 ) - { - i_encoding = NSJapaneseEUCStringEncoding; - } - else if( strncmp( psz_lang, "ru", 2 ) == 0 ) - { -#define CFSENC2NSSENC(e) CFStringConvertEncodingToNSStringEncoding(e) - i_encoding = CFSENC2NSSENC( kCFStringEncodingKOI8_R ); -#undef CFSENC2NSSENC - } -} - -- (NSString *)localizedString:(char *)psz -{ - NSString * o_str = nil; - - if( psz != NULL ) - { - UInt32 uiLength = (UInt32)strlen( psz ); - NSData * o_data = [NSData dataWithBytes: psz length: uiLength]; - o_str = [[[NSString alloc] initWithData: o_data - encoding: i_encoding] autorelease]; - } - - return( o_str ); -} - -- (char *)delocalizeString:(NSString *)id -{ - NSData * o_data = [id dataUsingEncoding: i_encoding - allowLossyConversion: NO]; - char * psz_string; - - if ( o_data == nil ) - { - o_data = [id dataUsingEncoding: i_encoding - allowLossyConversion: YES]; - psz_string = malloc( [o_data length] + 1 ); - [o_data getBytes: psz_string]; - psz_string[ [o_data length] ] = '\0'; - msg_Err( p_intf, "cannot convert to wanted encoding: %s", - psz_string ); - } - else - { - psz_string = malloc( [o_data length] + 1 ); - [o_data getBytes: psz_string]; - psz_string[ [o_data length] ] = '\0'; - } - - return psz_string; -} - -- (NSStringEncoding)getEncoding -{ - return i_encoding; -} - -- (void)setIntf:(intf_thread_t *)_p_intf -{ - p_intf = _p_intf; -} - -- (intf_thread_t *)getIntf -{ - return( p_intf ); -} - -- (void)terminate:(id)sender -{ - p_intf->p_vlc->b_die = VLC_TRUE; -} - -@end - int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) { int i_ret = 0; - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; if( [target respondsToSelector: @selector(performSelectorOnMainThread: withObject:waitUntilDone:)] ) { [target performSelectorOnMainThread: sel withObject: [NSValue valueWithPointer: p_arg] - waitUntilDone: YES]; + waitUntilDone: NO]; } - else if( NSApp != nil && [NSApp respondsToSelector: @selector(getIntf)] ) + else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] ) { NSValue * o_v1; NSValue * o_v2; @@ -230,7 +130,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) id * val[] = { &o_lock, &o_v2 }; - p_intf = (intf_thread_t *)[NSApp getIntf]; + p_intf = (intf_thread_t *)VLCIntf; o_recv_port = [[NSPort port] retain]; o_v1 = [NSValue valueWithPointer: val]; @@ -262,50 +162,248 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) i_ret = 1; } - [o_pool release]; + //[o_pool release]; return( i_ret ); } +/***************************************************************************** + * playlistChanged: Callback triggered by the intf-change playlist + * variable, to let the intf update the playlist. + *****************************************************************************/ +int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) +{ + intf_thread_t * p_intf = VLCIntf; + p_intf->p_sys->b_playlist_update = TRUE; + p_intf->p_sys->b_intf_update = TRUE; + return VLC_SUCCESS; +} + +static struct +{ + unichar i_nskey; + unsigned int i_vlckey; +} nskeys_to_vlckeys[] = +{ + { NSUpArrowFunctionKey, KEY_UP }, + { NSDownArrowFunctionKey, KEY_DOWN }, + { NSLeftArrowFunctionKey, KEY_LEFT }, + { NSRightArrowFunctionKey, KEY_RIGHT }, + { NSF1FunctionKey, KEY_F1 }, + { NSF2FunctionKey, KEY_F2 }, + { NSF3FunctionKey, KEY_F3 }, + { NSF4FunctionKey, KEY_F4 }, + { NSF5FunctionKey, KEY_F5 }, + { NSF6FunctionKey, KEY_F6 }, + { NSF7FunctionKey, KEY_F7 }, + { NSF8FunctionKey, KEY_F8 }, + { NSF9FunctionKey, KEY_F9 }, + { NSF10FunctionKey, KEY_F10 }, + { NSF11FunctionKey, KEY_F11 }, + { NSF12FunctionKey, KEY_F12 }, + { NSHomeFunctionKey, KEY_HOME }, + { NSEndFunctionKey, KEY_END }, + { NSPageUpFunctionKey, KEY_PAGEUP }, + { NSPageDownFunctionKey, KEY_PAGEDOWN }, + { NSTabCharacter, KEY_TAB }, + { NSCarriageReturnCharacter, KEY_ENTER }, + { NSEnterCharacter, KEY_ENTER }, + { NSBackspaceCharacter, KEY_BACKSPACE }, + { (unichar) ' ', KEY_SPACE }, + { (unichar) 0x1b, KEY_ESC }, + {0,0} +}; + +unichar VLCKeyToCocoa( unsigned int i_key ) +{ + unsigned int i; + + for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ ) + { + if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) ) + { + return nskeys_to_vlckeys[i].i_nskey; + } + } + return (unichar)(i_key & ~KEY_MODIFIER); +} + +unsigned int CocoaKeyToVLC( unichar i_key ) +{ + unsigned int i; + + for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ ) + { + if( nskeys_to_vlckeys[i].i_nskey == i_key ) + { + return nskeys_to_vlckeys[i].i_vlckey; + } + } + return (unsigned int)i_key; +} + +unsigned int VLCModifiersToCocoa( unsigned int i_key ) +{ + unsigned int new = 0; + if( i_key & KEY_MODIFIER_COMMAND ) + new |= NSCommandKeyMask; + if( i_key & KEY_MODIFIER_ALT ) + new |= NSAlternateKeyMask; + if( i_key & KEY_MODIFIER_SHIFT ) + new |= NSShiftKeyMask; + if( i_key & KEY_MODIFIER_CTRL ) + new |= NSControlKeyMask; + return new; +} + /***************************************************************************** * VLCMain implementation *****************************************************************************/ @implementation VLCMain +static VLCMain *_o_sharedMainInstance = nil; + ++ (VLCMain *)sharedInstance +{ + return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init]; +} + +- (id)init +{ + if( _o_sharedMainInstance) { + [self dealloc]; + } else { + _o_sharedMainInstance = [super init]; + } + + return _o_sharedMainInstance; +} + +- (void)setIntf: (intf_thread_t *)p_mainintf { + p_intf = p_mainintf; +} + +- (intf_thread_t *)getIntf { + return p_intf; +} + - (void)awakeFromNib { - [o_window setTitle: _NS("VLC - Controller")]; + unsigned int i_key = 0; + playlist_t *p_playlist; + vlc_value_t val; + + [self initStrings]; [o_window setExcludedFromWindowsMenu: TRUE]; + [o_msgs_panel setExcludedFromWindowsMenu: TRUE]; + [o_msgs_panel setDelegate: self]; + + i_key = config_GetInt( p_intf, "key-quit" ); + [o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-play-pause" ); + [o_mi_play setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_play setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-stop" ); + [o_mi_stop setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_stop setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-faster" ); + [o_mi_faster setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_faster setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-slower" ); + [o_mi_slower setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_slower setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-prev" ); + [o_mi_previous setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_previous setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-next" ); + [o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump+10sec" ); + [o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump-10sec" ); + [o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump+1min" ); + [o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump-1min" ); + [o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump+5min" ); + [o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-jump-5min" ); + [o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-vol-up" ); + [o_mi_vol_up setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_vol_up setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-vol-down" ); + [o_mi_vol_down setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_vol_down setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-vol-mute" ); + [o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + i_key = config_GetInt( p_intf, "key-fullscreen" ); + [o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]]; + [o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)]; + + var_Create( p_intf, "intf-change", VLC_VAR_BOOL ); + + [self setSubmenusEnabled: FALSE]; + [self manageVolumeSlider]; + + p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + + if( p_playlist ) + { + /* Check if we need to start playing */ + if( p_intf->b_play ) + { + playlist_Play( p_playlist ); + } + [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )]; + vlc_object_release( p_playlist ); + } +} + +- (void)initStrings +{ + [o_window setTitle: _NS("VLC - Controller")]; + [o_scrollfield setStringValue: _NS("VLC media player")]; /* button controls */ - [o_btn_playlist setToolTip: _NS("Playlist")]; [o_btn_prev setToolTip: _NS("Previous")]; - [o_btn_slower setToolTip: _NS("Slower")]; + [o_btn_rewind setToolTip: _NS("Rewind")]; [o_btn_play setToolTip: _NS("Play")]; [o_btn_stop setToolTip: _NS("Stop")]; - [o_btn_faster setToolTip: _NS("Faster")]; + [o_btn_ff setToolTip: _NS("Fast Forward")]; [o_btn_next setToolTip: _NS("Next")]; - [o_btn_prefs setToolTip: _NS("Preferences")]; + [o_btn_fullscreen setToolTip: _NS("Fullscreen")]; [o_volumeslider setToolTip: _NS("Volume")]; [o_timeslider setToolTip: _NS("Position")]; /* messages panel */ - [o_msgs_panel setDelegate: self]; [o_msgs_panel setTitle: _NS("Messages")]; - [o_msgs_panel setExcludedFromWindowsMenu: TRUE]; [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")]; /* main menu */ [o_mi_about setTitle: _NS("About VLC media player")]; [o_mi_prefs setTitle: _NS("Preferences...")]; + [o_mi_add_intf setTitle: _NS("Add Interface")]; + [o_mu_add_intf setTitle: _NS("Add Interface")]; + [o_mi_services setTitle: _NS("Services")]; [o_mi_hide setTitle: _NS("Hide VLC")]; [o_mi_hide_others setTitle: _NS("Hide Others")]; [o_mi_show_all setTitle: _NS("Show All")]; [o_mi_quit setTitle: _NS("Quit VLC")]; [o_mu_file setTitle: _ANS("1:File")]; - [o_mi_open_generic setTitle: _NS("Open...")]; - [o_mi_open_file setTitle: _NS("Open File...")]; + [o_mi_open_generic setTitle: _NS("Open File...")]; + [o_mi_open_file setTitle: _NS("Quick Open File...")]; [o_mi_open_disc setTitle: _NS("Open Disc...")]; [o_mi_open_net setTitle: _NS("Open Network...")]; [o_mi_open_recent setTitle: _NS("Open Recent")]; @@ -325,29 +423,47 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_mi_slower setTitle: _NS("Slower")]; [o_mi_previous setTitle: _NS("Previous")]; [o_mi_next setTitle: _NS("Next")]; - [o_mi_loop setTitle: _NS("Loop")]; + [o_mi_random setTitle: _NS("Random")]; + [o_mi_repeat setTitle: _NS("Repeat One")]; + [o_mi_loop setTitle: _NS("Repeat All")]; [o_mi_fwd setTitle: _NS("Step Forward")]; [o_mi_bwd setTitle: _NS("Step Backward")]; + [o_mi_program setTitle: _NS("Program")]; + [o_mu_program setTitle: _NS("Program")]; [o_mi_title setTitle: _NS("Title")]; + [o_mu_title setTitle: _NS("Title")]; [o_mi_chapter setTitle: _NS("Chapter")]; - [o_mi_language setTitle: _NS("Language")]; - [o_mi_subtitle setTitle: _NS("Subtitles")]; + [o_mu_chapter setTitle: _NS("Chapter")]; [o_mu_audio setTitle: _NS("Audio")]; [o_mi_vol_up setTitle: _NS("Volume Up")]; [o_mi_vol_down setTitle: _NS("Volume Down")]; [o_mi_mute setTitle: _NS("Mute")]; - [o_mi_channels setTitle: _NS("Channels")]; - [o_mi_device setTitle: _NS("Device")]; + [o_mi_audiotrack setTitle: _NS("Audio Track")]; + [o_mu_audiotrack setTitle: _NS("Audio Track")]; + [o_mi_channels setTitle: _NS("Audio Channels")]; + [o_mu_channels setTitle: _NS("Audio Channels")]; + [o_mi_device setTitle: _NS("Audio Device")]; + [o_mu_device setTitle: _NS("Audio Device")]; + [o_mi_visual setTitle: _NS("Visualizations")]; + [o_mu_visual setTitle: _NS("Visualizations")]; [o_mu_video setTitle: _NS("Video")]; [o_mi_half_window setTitle: _NS("Half Size")]; [o_mi_normal_window setTitle: _NS("Normal Size")]; [o_mi_double_window setTitle: _NS("Double Size")]; + [o_mi_fittoscreen setTitle: _NS("Fit to Screen")]; [o_mi_fullscreen setTitle: _NS("Fullscreen")]; - [o_mi_screen setTitle: _NS("Screen")]; + [o_mi_floatontop setTitle: _NS("Float on Top")]; + [o_mi_videotrack setTitle: _NS("Video Track")]; + [o_mu_videotrack setTitle: _NS("Video Track")]; + [o_mi_screen setTitle: _NS("Video Device")]; + [o_mu_screen setTitle: _NS("Video Device")]; + [o_mi_subtitle setTitle: _NS("Subtitles Track")]; + [o_mu_subtitle setTitle: _NS("Subtitles Track")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")]; + [o_mu_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_window setTitle: _NS("Window")]; [o_mi_minimize setTitle: _NS("Minimize Window")]; @@ -361,6 +477,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_mu_help setTitle: _NS("Help")]; [o_mi_readme setTitle: _NS("ReadMe...")]; + [o_mi_documentation setTitle: _NS("Online Documentation")]; [o_mi_reportabug setTitle: _NS("Report a Bug")]; [o_mi_website setTitle: _NS("VideoLAN Website")]; [o_mi_license setTitle: _NS("License")]; @@ -370,6 +487,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_dmi_stop setTitle: _NS("Stop")]; [o_dmi_next setTitle: _NS("Next")]; [o_dmi_previous setTitle: _NS("Previous")]; + [o_dmi_mute setTitle: _NS("Mute")]; /* error panel */ [o_error setTitle: _NS("Error")]; @@ -377,22 +495,20 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")]; [o_err_btn_msgs setTitle: _NS("Open Messages Window")]; [o_err_btn_dismiss setTitle: _NS("Dismiss")]; + [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")]; [o_info_window setTitle: _NS("Info")]; - - [self setSubmenusEnabled: FALSE]; - [self manageVolumeSlider]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification { - intf_thread_t * p_intf = [NSApp getIntf]; - o_msg_lock = [[NSLock alloc] init]; o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain]; o_img_play = [[NSImage imageNamed: @"play"] retain]; + o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain]; o_img_pause = [[NSImage imageNamed: @"pause"] retain]; + o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain]; [p_intf->p_sys->o_sendport setDelegate: self]; [[NSRunLoop currentRunLoop] @@ -405,255 +521,254 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [NSThread detachNewThreadSelector: @selector(manage) toTarget: self withObject: nil]; + + [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf + var: "intf-add" selector: @selector(toggleVar:)]; vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); } - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename { + NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil]; [o_playlist appendArray: - [NSArray arrayWithObject: o_filename] atPos: -1 enqueue: NO]; - + [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO]; + return( TRUE ); } -- (id)getControls +- (NSString *)localizedString:(char *)psz { - if ( o_controls ) + NSString * o_str = nil; + + if( psz != NULL ) { - return o_controls; + o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease]; } - return nil; -} - -- (void)manage -{ - NSDate * o_sleep_date; - intf_thread_t * p_intf = [NSApp getIntf]; - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - - vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); - - while( !p_intf->b_die ) + if ( o_str == NULL ) { - playlist_t * p_playlist; - - vlc_mutex_lock( &p_intf->change_lock ); - - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist != NULL ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - - [self manage: p_playlist]; - - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - } - - vlc_mutex_unlock( &p_intf->change_lock ); - - o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5]; - [NSThread sleepUntilDate: o_sleep_date]; + msg_Err( VLCIntf, "could not translate: %s", psz ); } - [self terminate]; - - [o_pool release]; + return( o_str ); } -- (void)manage:(playlist_t *)p_playlist +- (char *)delocalizeString:(NSString *)id { - vlc_value_t val; - - intf_thread_t * p_intf = [NSApp getIntf]; + NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding + allowLossyConversion: NO]; + char * psz_string; - if( var_Get( (vlc_object_t *)p_playlist, "intf-change", &val ) >= 0 && - val.b_bool ) + if ( o_data == nil ) { - p_intf->p_sys->b_playlist_update = VLC_TRUE; - p_intf->p_sys->b_intf_update = VLC_TRUE; + o_data = [id dataUsingEncoding: NSUTF8StringEncoding + allowLossyConversion: YES]; + psz_string = malloc( [o_data length] + 1 ); + [o_data getBytes: psz_string]; + psz_string[ [o_data length] ] = '\0'; + msg_Err( VLCIntf, "cannot convert to wanted encoding: %s", + psz_string ); } - -#define p_input p_playlist->p_input - - if( p_input ) + else { - vout_thread_t * p_vout = NULL; - aout_instance_t * p_aout = NULL; - vlc_bool_t b_need_menus = VLC_FALSE; - - vlc_mutex_lock( &p_input->stream.stream_lock ); - - if( !p_input->b_die ) - { - audio_volume_t i_volume; - - /* New input or stream map change */ - if( p_input->stream.b_changed ) - { - p_intf->p_sys->b_playing = 1; - [self manageMode: p_playlist]; - b_need_menus = VLC_TRUE; - } + psz_string = malloc( [o_data length] + 1 ); + [o_data getBytes: psz_string]; + psz_string[ [o_data length] ] = '\0'; + } - if( p_intf->p_sys->i_part != - p_input->stream.p_selected_area->i_part ) - { - p_intf->p_sys->b_chapter_update = 1; - b_need_menus = VLC_TRUE; - } + return psz_string; +} - p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); - if( p_aout != NULL ) - { - vlc_value_t val; +/* i_width is in pixels */ +- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width +{ + NSMutableString *o_wrapped; + NSString *o_out_string; + NSRange glyphRange, effectiveRange, charRange; + NSRect lineFragmentRect; + unsigned glyphIndex, breaksInserted = 0; + + NSTextStorage *o_storage = [[NSTextStorage alloc] initWithString: o_in_string + attributes: [NSDictionary dictionaryWithObjectsAndKeys: + [NSFont labelFontOfSize: 0.0], NSFontAttributeName, nil]]; + NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init]; + NSTextContainer *o_container = [[NSTextContainer alloc] + initWithContainerSize: NSMakeSize(i_width, 2000)]; + + [o_layout_manager addTextContainer: o_container]; + [o_container release]; + [o_storage addLayoutManager: o_layout_manager]; + [o_layout_manager release]; + + o_wrapped = [o_in_string mutableCopy]; + glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container]; + + for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ; + glyphIndex += effectiveRange.length) { + lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex + effectiveRange: &effectiveRange]; + charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange + actualGlyphRange: &effectiveRange]; + if ([o_wrapped lineRangeForRange: + NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) { + [o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted]; + breaksInserted++; + } + } + o_out_string = [NSString stringWithString: o_wrapped]; + [o_wrapped release]; + [o_storage release]; + + return o_out_string; +} - if( var_Get( (vlc_object_t *)p_aout, "intf-change", &val ) - >= 0 && val.b_bool ) - { - p_intf->p_sys->b_aout_update = 1; - b_need_menus = VLC_TRUE; - } - vlc_object_release( (vlc_object_t *)p_aout ); - } +/***************************************************************************** + * hasDefinedShortcutKey: Check to see if the key press is a defined VLC + * shortcut key. If it is, pass it off to VLC for handling and return YES, + * otherwise ignore it and return NO (where it will get handled by Cocoa). + *****************************************************************************/ +- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event +{ + unichar key = 0; + vlc_value_t val; + unsigned int i_pressed_modifiers = 0; + struct hotkey *p_hotkeys; + int i; - aout_VolumeGet( p_intf, &i_volume ); - p_intf->p_sys->b_mute = ( i_volume == 0 ); + val.i_int = 0; + p_hotkeys = p_intf->p_vlc->p_hotkeys; - p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - if( p_vout != NULL ) - { - vlc_value_t val; + i_pressed_modifiers = [o_event modifierFlags]; - if( var_Get( (vlc_object_t *)p_vout, "intf-change", &val ) - >= 0 && val.b_bool ) - { - p_intf->p_sys->b_vout_update = 1; - b_need_menus = VLC_TRUE; - } + if( i_pressed_modifiers & NSShiftKeyMask ) + val.i_int |= KEY_MODIFIER_SHIFT; + if( i_pressed_modifiers & NSControlKeyMask ) + val.i_int |= KEY_MODIFIER_CTRL; + if( i_pressed_modifiers & NSAlternateKeyMask ) + val.i_int |= KEY_MODIFIER_ALT; + if( i_pressed_modifiers & NSCommandKeyMask ) + val.i_int |= KEY_MODIFIER_COMMAND; - vlc_object_release( (vlc_object_t *)p_vout ); - } + key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0]; - if( b_need_menus ) - { - [self setupMenus: p_input]; - } - } + val.i_int |= CocoaKeyToVLC( key ); - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - else if( p_intf->p_sys->b_playing && !p_intf->b_die ) + for( i = 0; p_hotkeys[i].psz_action != NULL; i++ ) { - p_intf->p_sys->b_playing = 0; - [self manageMode: p_playlist]; + if( p_hotkeys[i].i_key == val.i_int ) + { + var_Set( p_intf->p_vlc, "key-pressed", val ); + return YES; + } } -#undef p_input + return NO; } -- (void)manageMode:(playlist_t *)p_playlist +- (id)getControls { - intf_thread_t * p_intf = [NSApp getIntf]; - - if( p_playlist->p_input != NULL ) - { - /* get ready for menu regeneration */ - p_intf->p_sys->b_program_update = 1; - p_intf->p_sys->b_title_update = 1; - p_intf->p_sys->b_chapter_update = 1; - p_intf->p_sys->b_audio_update = 1; - p_intf->p_sys->b_spu_update = 1; - p_intf->p_sys->b_current_title_update = 1; - p_intf->p_sys->i_part = 0; - - p_playlist->p_input->stream.b_changed = 0; - - msg_Dbg( p_intf, "stream has changed, refreshing interface" ); - } - else + if ( o_controls ) { - vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - if( p_vout != NULL ) - { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - - vlc_mutex_unlock( &p_playlist->object_lock ); - vout_Destroy( p_vout ); - vlc_mutex_lock( &p_playlist->object_lock ); - } + return o_controls; } - - p_intf->p_sys->b_intf_update = VLC_TRUE; + return nil; } -- (void)manageIntf:(NSTimer *)o_timer +- (id)getPlaylist { - intf_thread_t * p_intf = [NSApp getIntf]; - - if( p_intf->p_vlc->b_die == VLC_TRUE ) + if ( o_playlist ) { - [o_timer invalidate]; - return; + return o_playlist; } + return nil; +} - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist == NULL ) +- (id)getInfo +{ + if ( o_info ) { - return; + return o_info; } + return nil; +} - if ( p_intf->p_sys->b_playlist_update ) - { - vlc_value_t val; +- (void)manage +{ + NSDate * o_sleep_date; + playlist_t * p_playlist; + + /* new thread requires a new pool */ + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - val.b_bool = 0; - var_Set( (vlc_object_t *)p_playlist, "intf-change", val ); + vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); - [o_playlist playlistUpdated]; + p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - p_intf->p_sys->b_playlist_update = VLC_FALSE; + if( p_playlist != NULL ) + { + var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-change", PlaylistChanged, self ); + var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); + vlc_object_release( p_playlist ); } - if( p_intf->p_sys->b_current_title_update ) + while( !p_intf->b_die ) { - id o_vout_wnd; + vlc_mutex_lock( &p_intf->change_lock ); - NSEnumerator * o_enum = [[NSApp windows] objectEnumerator]; +#define p_input p_intf->p_sys->p_input - while( ( o_vout_wnd = [o_enum nextObject] ) ) + if( p_input == NULL ) { - if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, + FIND_ANYWHERE ); + + /* Refresh the interface */ + if( p_input ) { - [o_vout_wnd updateTitle]; + msg_Dbg( p_intf, "input has changed, refreshing interface" ); + p_intf->p_sys->i_play_status = PLAYING_S; + p_intf->p_sys->b_playing = TRUE; + p_intf->p_sys->b_current_title_update = 1; + p_intf->p_sys->b_intf_update = TRUE; + p_intf->p_sys->b_input_update = TRUE; } } + else if( p_input->b_dead ) + { + /* input stopped */ + p_intf->p_sys->b_playing = FALSE; + p_intf->p_sys->b_intf_update = TRUE; + p_intf->p_sys->i_play_status = PAUSE_S; + [o_scrollfield setStringValue: _NS("VLC media player") ]; + vlc_object_release( p_input ); + p_input = NULL; + } +#undef p_input - [o_playlist updateRowSelection]; - [o_info updateInfo]; + vlc_mutex_unlock( &p_intf->change_lock ); - p_intf->p_sys->b_current_title_update = FALSE; + o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .3]; + [NSThread sleepUntilDate: o_sleep_date]; } - vlc_mutex_lock( &p_playlist->object_lock ); + [self terminate]; + [o_pool release]; +} -#define p_input p_playlist->p_input +- (void)manageIntf:(NSTimer *)o_timer +{ + vlc_value_t val; - if( p_input != NULL ) + if( p_intf->p_vlc->b_die == VLC_TRUE ) { - vlc_mutex_lock( &p_input->stream.stream_lock ); + [o_timer invalidate]; + return; } +#define p_input p_intf->p_sys->p_input if( p_intf->p_sys->b_intf_update ) { vlc_bool_t b_input = VLC_FALSE; @@ -662,36 +777,28 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) vlc_bool_t b_seekable = VLC_FALSE; vlc_bool_t b_chapters = VLC_FALSE; + playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); b_plmul = p_playlist->i_size > 1; + + vlc_object_release( p_playlist ); if( ( b_input = ( p_input != NULL ) ) ) { /* seekable streams */ - b_seekable = p_input->stream.b_seekable; - - /* control buttons for free pace streams */ - b_control = p_input->stream.b_pace_control; + var_Get( p_input, "seekable", &val); + b_seekable = val.b_bool; - /* chapters */ - b_chapters = p_input->stream.p_selected_area->i_part_nb > 1; + /* check wether slow/fast motion is possible*/ + b_control = p_input->input.b_can_pace_control; - /* play status */ - p_intf->p_sys->b_play_status = - p_input->stream.control.i_status != PAUSE_S; + /* chapters & titles */ + //b_chapters = p_input->stream.i_area_nb > 1; } - else - { - /* play status */ - p_intf->p_sys->b_play_status = VLC_FALSE; - - [self setSubmenusEnabled: FALSE]; - } - - [self playStatusUpdated: p_intf->p_sys->b_play_status]; [o_btn_stop setEnabled: b_input]; - [o_btn_faster setEnabled: b_control]; - [o_btn_slower setEnabled: b_control]; + [o_btn_ff setEnabled: b_seekable]; + [o_btn_rewind setEnabled: b_seekable]; [o_btn_prev setEnabled: (b_plmul || b_chapters)]; [o_btn_next setEnabled: (b_plmul || b_chapters)]; @@ -699,92 +806,202 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_timeslider setEnabled: b_seekable]; [o_timefield setStringValue: @"0:00:00"]; - [self manageVolumeSlider]; - p_intf->p_sys->b_intf_update = VLC_FALSE; } + + if ( p_intf->p_sys->b_playlist_update ) + { + [o_playlist playlistUpdated]; + p_intf->p_sys->b_playlist_update = VLC_FALSE; + } + + if( p_intf->p_sys->b_fullscreen_update ) + { + vout_thread_t * p_vout; -#define p_area p_input->stream.p_selected_area + playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - if( p_intf->p_sys->b_playing && p_input != NULL ) - { - vlc_bool_t b_field_update = VLC_TRUE; + [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ]; - if( !p_input->b_die && ( p_intf->p_sys->b_play_status != - ( p_input->stream.control.i_status != PAUSE_S ) ) ) - { - p_intf->p_sys->b_play_status = - !p_intf->p_sys->b_play_status; + vlc_object_release( p_playlist ); - [self playStatusUpdated: p_intf->p_sys->b_play_status]; + p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); + if( p_vout != NULL ) + { + [o_btn_fullscreen setEnabled: VLC_TRUE]; + vlc_object_release( p_vout ); } + else + { + [o_btn_fullscreen setEnabled: VLC_FALSE]; + } + p_intf->p_sys->b_fullscreen_update = VLC_FALSE; + } + + if( p_input && !p_input->b_die ) + { + vlc_value_t val; - if( p_input->stream.b_seekable ) + if( p_intf->p_sys->b_current_title_update ) { - if( f_slider == f_slider_old ) - { - float f_updated = ( 10000. * p_area->i_tell ) / - p_area->i_size; + NSString *o_temp; + vout_thread_t *p_vout; + playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - if( f_slider != f_updated ) - { - [o_timeslider setFloatValue: f_updated]; - } - } - else + if( p_playlist == NULL ) { - off_t i_seek = ( f_slider * p_area->i_size ) / 10000; + return; + } - /* release the lock to be able to seek */ - vlc_mutex_unlock( &p_input->stream.stream_lock ); - input_Seek( p_input, i_seek, INPUT_SEEK_SET ); - vlc_mutex_lock( &p_input->stream.stream_lock ); + vlc_mutex_lock( &p_playlist->object_lock ); + o_temp = [NSString stringWithUTF8String: + p_playlist->pp_items[p_playlist->i_index]->input.psz_name]; + if( o_temp == NULL ) + o_temp = [NSString stringWithCString: + p_playlist->pp_items[p_playlist->i_index]->input.psz_name]; + vlc_mutex_unlock( &p_playlist->object_lock ); + [o_scrollfield setStringValue: o_temp ]; - /* update the old value */ - f_slider_old = f_slider; - b_field_update = VLC_FALSE; + p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) + { + id o_vout_wnd; + NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator]; + + while( ( o_vout_wnd = [o_enum nextObject] ) ) + { + if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + { + ;//[o_vout_wnd updateTitle]; + } + } + vlc_object_release( (vlc_object_t *)p_vout ); } + [o_playlist updateRowSelection]; + vlc_object_release( p_playlist ); + p_intf->p_sys->b_current_title_update = FALSE; } - if( b_field_update ) + if( p_intf->p_sys->b_playing && [o_timeslider isEnabled] ) { + /* Update the slider */ + vlc_value_t time; NSString * o_time; - char psz_time[ OFFSETTOTIME_MAX_SIZE ]; + mtime_t i_seconds; + vlc_value_t pos; + float f_updated; + + var_Get( p_input, "position", &pos ); + f_updated = 10000. * pos.f_float; + [o_timeslider setFloatValue: f_updated]; + + var_Get( p_input, "time", &time ); + i_seconds = time.i_time / 1000000; + + o_time = [NSString stringWithFormat: @"%d:%02d:%02d", + (int) (i_seconds / (60 * 60)), + (int) (i_seconds / 60 % 60), + (int) (i_seconds % 60)]; + [o_timefield setStringValue: o_time]; + } + + /* Manage volume status */ + [self manageVolumeSlider]; + + /* Manage Playing status */ + var_Get( p_input, "state", &val ); + if( p_intf->p_sys->i_play_status != val.i_int ) + { + p_intf->p_sys->i_play_status = val.i_int; + [self playStatusUpdated: p_intf->p_sys->i_play_status]; + } + } + else if( p_intf->p_sys->b_playing && !p_intf->b_die ) + { + p_intf->p_sys->i_play_status = PAUSE_S; + p_intf->p_sys->b_intf_update = VLC_TRUE; + [self playStatusUpdated: p_intf->p_sys->i_play_status]; + [self setSubmenusEnabled: FALSE]; + } - input_OffsetToTime( p_input, psz_time, p_area->i_tell ); +#undef p_input - o_time = [NSString stringWithCString: psz_time]; - [o_timefield setStringValue: o_time]; + [self updateMessageArray]; + + [NSTimer scheduledTimerWithTimeInterval: 0.3 + target: self selector: @selector(manageIntf:) + userInfo: nil repeats: FALSE]; +} + +- (void)setupMenus +{ + playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); + + if( p_playlist != NULL ) + { +#define p_input p_playlist->p_input + if( p_input != NULL ) + { + [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input + var: "program" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input + var: "title" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input + var: "chapter" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input + var: "audio-es" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input + var: "video-es" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input + var: "spu-es" selector: @selector(toggleVar:)]; + + aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, + FIND_ANYWHERE ); + if ( p_aout != NULL ) + { + [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout + var: "audio-channels" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout + var: "audio-device" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout + var: "visual" selector: @selector(toggleVar:)]; + vlc_object_release( (vlc_object_t *)p_aout ); + } + + vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + + if ( p_vout != NULL ) + { + [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout + var: "video-device" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout + var: "deinterlace" selector: @selector(toggleVar:)]; + vlc_object_release( (vlc_object_t *)p_vout ); + } } - - /* disable screen saver */ - UpdateSystemActivity( UsrActivity ); - } - -#undef p_area - - if( p_input != NULL ) - { - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - #undef p_input - - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - - [self updateMessageArray]; - - [NSTimer scheduledTimerWithTimeInterval: 0.5 - target: self selector: @selector(manageIntf:) - userInfo: nil repeats: FALSE]; + } + vlc_object_release( (vlc_object_t *)p_playlist ); } - (void)updateMessageArray { int i_start, i_stop; - intf_thread_t * p_intf = [NSApp getIntf]; + vlc_value_t quiet; vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); i_stop = *p_intf->p_sys->p_sub->pi_stop; @@ -813,7 +1030,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_msg_lock lock]; - if( [o_msg_arr count] + 2 > 200 ) + if( [o_msg_arr count] + 2 > 400 ) { unsigned rid[] = { 0, 1 }; [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid @@ -839,7 +1056,9 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_msg_lock unlock]; - if( i_type == 1 ) + var_Get( p_intf->p_vlc, "verbose", &quiet ); + + if( i_type == 1 && quiet.i_int > -1 ) { NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n", p_intf->p_sys->p_sub->p_msg[i_start].psz_module, @@ -861,11 +1080,12 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) } } -- (void)playStatusUpdated:(BOOL)b_pause +- (void)playStatusUpdated:(int)i_status { - if( b_pause ) + if( i_status != PAUSE_S ) { [o_btn_play setImage: o_img_pause]; + [o_btn_play setAlternateImage: o_img_pause_pressed]; [o_btn_play setToolTip: _NS("Pause")]; [o_mi_play setTitle: _NS("Pause")]; [o_dmi_play setTitle: _NS("Pause")]; @@ -873,6 +1093,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) else { [o_btn_play setImage: o_img_play]; + [o_btn_play setAlternateImage: o_img_play_pressed]; [o_btn_play setToolTip: _NS("Play")]; [o_mi_play setTitle: _NS("Play")]; [o_dmi_play setTitle: _NS("Play")]; @@ -884,9 +1105,12 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) [o_mi_program setEnabled: b_enabled]; [o_mi_title setEnabled: b_enabled]; [o_mi_chapter setEnabled: b_enabled]; - [o_mi_language setEnabled: b_enabled]; + [o_mi_audiotrack setEnabled: b_enabled]; + [o_mi_visual setEnabled: b_enabled]; + [o_mi_videotrack setEnabled: b_enabled]; [o_mi_subtitle setEnabled: b_enabled]; [o_mi_channels setEnabled: b_enabled]; + [o_mi_deinterlace setEnabled: b_enabled]; [o_mi_device setEnabled: b_enabled]; [o_mi_screen setEnabled: b_enabled]; } @@ -894,47 +1118,97 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) - (void)manageVolumeSlider { audio_volume_t i_volume; - intf_thread_t * p_intf = [NSApp getIntf]; aout_VolumeGet( p_intf, &i_volume ); [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP]; - [o_volumeslider setEnabled: 1]; + [o_volumeslider setEnabled: TRUE]; p_intf->p_sys->b_mute = ( i_volume == 0 ); } +- (IBAction)timesliderUpdate:(id)sender +{ + input_thread_t * p_input; + float f_updated; + + switch( [[NSApp currentEvent] type] ) + { + case NSLeftMouseUp: + case NSLeftMouseDown: + case NSLeftMouseDragged: + f_updated = [sender floatValue]; + break; + + default: + return; + } + + p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, + FIND_ANYWHERE ); + + if( p_input != NULL ) + { + vlc_value_t time; + vlc_value_t pos; + mtime_t i_seconds; + NSString * o_time; + + pos.f_float = f_updated / 10000.; + var_Set( p_input, "position", pos ); + [o_timeslider setFloatValue: f_updated]; + + var_Get( p_input, "time", &time ); + i_seconds = time.i_time / 1000000; + + o_time = [NSString stringWithFormat: @"%d:%02d:%02d", + (int) (i_seconds / (60 * 60)), + (int) (i_seconds / 60 % 60), + (int) (i_seconds % 60)]; + [o_timefield setStringValue: o_time]; + + vlc_object_release( p_input ); + } +} + - (void)terminate { - NSEvent * o_event; - vout_thread_t * p_vout; playlist_t * p_playlist; - intf_thread_t * p_intf = [NSApp getIntf]; - - /* - * Free playlists - */ - msg_Dbg( p_intf, "removing all playlists" ); - while( (p_playlist = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_PLAYLIST, - FIND_CHILD )) ) + vout_thread_t * p_vout; + + /* Stop playback */ + if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ) ) ) { - vlc_object_detach( p_playlist ); + playlist_Stop( p_playlist ); vlc_object_release( p_playlist ); - playlist_Destroy( p_playlist ); } - /* - * Free video outputs - */ - msg_Dbg( p_intf, "removing all video outputs" ); - while( (p_vout = vlc_object_find( p_intf->p_vlc, - VLC_OBJECT_VOUT, FIND_CHILD )) ) + /* FIXME - Wait here until all vouts are terminated because + libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't + good on OS X. We definitly need a cleaner way to handle this, + but this may hopefully be good enough for now. + -- titer 2003/11/22 */ + while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ) ) ) { - vlc_object_detach( p_vout ); vlc_object_release( p_vout ); - vout_Destroy( p_vout ); + msleep( 100000 ); } + msleep( 500000 ); + if( o_img_pause_pressed != nil ) + { + [o_img_pause_pressed release]; + o_img_pause_pressed = nil; + } + + if( o_img_pause_pressed != nil ) + { + [o_img_pause_pressed release]; + o_img_pause_pressed = nil; + } + if( o_img_pause != nil ) { [o_img_pause release]; @@ -960,395 +1234,11 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) o_msg_lock = nil; } - if( o_prefs != nil ) - { - [o_prefs release]; - o_prefs = nil; - } - - [NSApp stop: nil]; - /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; - - /* send a dummy event to break out of the event loop */ - o_event = [NSEvent mouseEventWithType: NSLeftMouseDown - location: NSMakePoint( 1, 1 ) modifierFlags: 0 - timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber] - context: [NSGraphicsContext currentContext] eventNumber: 1 - clickCount: 1 pressure: 0.0]; - [NSApp postEvent: o_event atStart: YES]; -} - -- (void)setupMenus:(input_thread_t *)p_input -{ - unsigned int i, i_nb_items; - NSMenuItem * o_item; - NSString * o_menu_title; - char psz_title[ 256 ]; - - es_descriptor_t * p_audio_es = NULL; - es_descriptor_t * p_spu_es = NULL; - - intf_thread_t * p_intf = [NSApp getIntf]; - - p_intf->p_sys->b_chapter_update |= p_intf->p_sys->b_title_update; - p_intf->p_sys->b_audio_update |= p_intf->p_sys->b_title_update | - p_intf->p_sys->b_program_update; - p_intf->p_sys->b_spu_update |= p_intf->p_sys->b_title_update | - p_intf->p_sys->b_program_update; - - if( p_intf->p_sys->b_program_update ) - { - NSMenu * o_program; - SEL pf_toggle_program; - pgrm_descriptor_t * p_pgrm; - - if( p_input->stream.p_new_program ) - { - p_pgrm = p_input->stream.p_new_program; - } - else - { - p_pgrm = p_input->stream.p_selected_program; - } - - o_program = [o_mi_program submenu]; - pf_toggle_program = @selector(toggleProgram:); - - /* remove previous program items */ - i_nb_items = [o_program numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_program removeItemAtIndex: 0]; - } - - /* make (un)sensitive */ - [o_mi_program setEnabled: - p_input->stream.i_pgrm_number > 1]; - - /* add program items */ - for( i = 0 ; i < p_input->stream.i_pgrm_number ; i++ ) - { - snprintf( psz_title, sizeof(psz_title), "id %d", - p_input->stream.pp_programs[i]->i_number ); - psz_title[sizeof(psz_title) - 1] = '\0'; - - o_menu_title = [NSApp localizedString: psz_title]; - - o_item = [o_program addItemWithTitle: o_menu_title - action: pf_toggle_program keyEquivalent: @""]; - [o_item setTag: p_input->stream.pp_programs[i]->i_number]; - [o_item setTarget: o_controls]; - - if( p_pgrm == p_input->stream.pp_programs[i] ) - { - [o_item setState: NSOnState]; - } - } - - p_intf->p_sys->b_program_update = 0; - } - - if( p_intf->p_sys->b_title_update ) - { - NSMenu * o_title; - SEL pf_toggle_title; - - o_title = [o_mi_title submenu]; - pf_toggle_title = @selector(toggleTitle:); - - /* remove previous title items */ - i_nb_items = [o_title numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_title removeItemAtIndex: 0]; - } - - /* make (un)sensitive */ - [o_mi_title setEnabled: - p_input->stream.i_area_nb > 1]; - - /* add title items */ - for( i = 1 ; i < p_input->stream.i_area_nb ; i++ ) - { - snprintf( psz_title, sizeof(psz_title), "Title %d (%d)", i, - p_input->stream.pp_areas[i]->i_part_nb ); - psz_title[sizeof(psz_title) - 1] = '\0'; - - o_menu_title = [NSApp localizedString: psz_title]; - - o_item = [o_title addItemWithTitle: o_menu_title - action: pf_toggle_title keyEquivalent: @""]; - [o_item setTag: i]; - [o_item setTarget: o_controls]; - - if( ( p_input->stream.pp_areas[i] == - p_input->stream.p_selected_area ) ) - { - [o_item setState: NSOnState]; - } - } - - p_intf->p_sys->b_title_update = 0; - } - - if( p_intf->p_sys->b_chapter_update ) - { - NSMenu * o_chapter; - SEL pf_toggle_chapter; - - o_chapter = [o_mi_chapter submenu]; - pf_toggle_chapter = @selector(toggleChapter:); - - /* remove previous chapter items */ - i_nb_items = [o_chapter numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_chapter removeItemAtIndex: 0]; - } - - /* make (un)sensitive */ - [o_mi_chapter setEnabled: - p_input->stream.p_selected_area->i_part_nb > 1]; - - /* add chapter items */ - for( i = 0 ; i < p_input->stream.p_selected_area->i_part_nb ; i++ ) - { - snprintf( psz_title, sizeof(psz_title), "Chapter %d", i + 1 ); - psz_title[sizeof(psz_title) - 1] = '\0'; - - o_menu_title = [NSApp localizedString: psz_title]; - - o_item = [o_chapter addItemWithTitle: o_menu_title - action: pf_toggle_chapter keyEquivalent: @""]; - [o_item setTag: i + 1]; - [o_item setTarget: o_controls]; - - if( ( p_input->stream.p_selected_area->i_part == i + 1 ) ) - { - [o_item setState: NSOnState]; - } - } - - p_intf->p_sys->i_part = - p_input->stream.p_selected_area->i_part; - - p_intf->p_sys->b_chapter_update = 0; - } - - for( i = 0 ; i < p_input->stream.i_selected_es_number ; i++ ) - { - if( p_input->stream.pp_selected_es[i]->i_cat == AUDIO_ES ) - { - p_audio_es = p_input->stream.pp_selected_es[i]; - } - else if( p_input->stream.pp_selected_es[i]->i_cat == SPU_ES ) - { - p_spu_es = p_input->stream.pp_selected_es[i]; - } - } - - if( p_intf->p_sys->b_audio_update ) - { - [self setupLangMenu: p_input mi: o_mi_language es: p_audio_es - category: AUDIO_ES selector: @selector(toggleLanguage:)]; - - p_intf->p_sys->b_audio_update = 0; - } - - if( p_intf->p_sys->b_spu_update ) - { - [self setupLangMenu: p_input mi: o_mi_subtitle es: p_spu_es - category: SPU_ES selector: @selector(toggleLanguage:)]; - - p_intf->p_sys->b_spu_update = 0; - } - - if ( p_intf->p_sys->b_aout_update ) - { - aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); - - if ( p_aout != NULL ) - { - vlc_value_t val; - val.b_bool = 0; - - var_Set( (vlc_object_t *)p_aout, "intf-change", val ); - - [self setupVarMenu: o_mi_channels target: (vlc_object_t *)p_aout - var: "audio-channels" selector: @selector(toggleVar:)]; - - [self setupVarMenu: o_mi_device target: (vlc_object_t *)p_aout - var: "audio-device" selector: @selector(toggleVar:)]; - - vlc_object_release( (vlc_object_t *)p_aout ); - } - - p_intf->p_sys->b_aout_update = 0; - } - - if( p_intf->p_sys->b_vout_update ) - { - vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - - if ( p_vout != NULL ) - { - vlc_value_t val; - val.b_bool = 0; - - var_Set( (vlc_object_t *)p_vout, "intf-change", val ); - - [self setupVarMenu: o_mi_screen target: (vlc_object_t *)p_vout - var: "video-device" selector: @selector(toggleVar:)]; - - vlc_object_release( (vlc_object_t *)p_vout ); - - [o_mi_close_window setEnabled: TRUE]; - } - - p_intf->p_sys->b_vout_update = 0; - } - -#undef 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 -{ - unsigned int i, i_nb_items; - NSMenu * o_menu = [o_mi submenu]; - - /* remove previous language items */ - i_nb_items = [o_menu numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_menu removeItemAtIndex: 0]; - } - - /* make sensitive : we can't change it after we build the menu, and - * before, we don't yet how many items we will have. So make it - * always sensitive. --Meuuh */ - [o_mi setEnabled: TRUE]; - -#if 0 - /* We do not use this code, because you need to start stop .avi for - * it to work, so not very useful now --hartman */ - if ( o_mi == o_mi_subtitle ) { - NSLog(@"testing"); - [o_mi setEnabled: TRUE ]; - NSMenuItem * o_lmi; - NSString * o_title; - o_title = _NS("Load from file.."); - o_lmi = [o_menu addItemWithTitle: o_title - action: pf_callback keyEquivalent: @""]; - [o_lmi setTag: 2000]; - [o_lmi setTarget: o_controls]; - } -#endif - -#define ES p_input->stream.pp_es[i] - for( i = 0 ; i < p_input->stream.i_es_number ; i++ ) - { - if( ( ES->i_cat == i_cat ) && - ( !ES->p_pgrm || - ES->p_pgrm == - p_input->stream.p_selected_program ) ) - { - NSMenuItem * o_lmi; - NSString * o_title; - - if( *ES->psz_desc ) - { - o_title = [NSApp localizedString: ES->psz_desc]; - } - else - { - char psz_title[ 256 ]; - - snprintf( psz_title, sizeof(psz_title), _("Language 0x%x"), - ES->i_id ); - psz_title[sizeof(psz_title) - 1] = '\0'; - - o_title = [NSApp localizedString: psz_title]; - } - - o_lmi = [o_menu addItemWithTitle: o_title - action: pf_callback keyEquivalent: @""]; - [o_lmi setRepresentedObject: - [NSValue valueWithPointer: ES]]; - [o_lmi setTarget: o_controls]; - [o_lmi setTag: i_cat]; - - if( /*p_es == ES*/ ES->p_decoder_fifo != NULL ) - { - [o_lmi setState: NSOnState]; - } - } - } -#undef ES -} - -- (void)setupVarMenu:(NSMenuItem *)o_mi - target:(vlc_object_t *)p_object - var:(const char *)psz_variable - selector:(SEL)pf_callback -{ - int i, i_nb_items; - NSMenu * o_menu = [o_mi submenu]; - vlc_value_t val; - char * psz_value; - - /* remove previous items */ - i_nb_items = [o_menu numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_menu removeItemAtIndex: 0]; - } - - if ( var_Get( p_object, psz_variable, &val ) < 0 ) - { - return; - } - psz_value = val.psz_string; - - if ( var_Change( p_object, psz_variable, - VLC_VAR_GETLIST, &val ) < 0 ) - { - free( psz_value ); - return; - } - - /* make (un)sensitive */ - [o_mi setEnabled: ( val.p_list->i_count > 0 )]; - - for ( i = 0; i < val.p_list->i_count; i++ ) - { - NSMenuItem * o_lmi; - NSString * o_title; - - o_title = [NSApp localizedString: val.p_list->p_values[i].psz_string]; - o_lmi = [o_menu addItemWithTitle: o_title - action: pf_callback keyEquivalent: @""]; - /* FIXME: this isn't 64-bit clean ! */ - [o_lmi setTag: (int)psz_variable]; - [o_lmi setRepresentedObject: - [NSValue valueWithPointer: p_object]]; - [o_lmi setTarget: o_controls]; - - if ( !strcmp( psz_value, val.p_list->p_values[i].psz_string ) ) - [o_lmi setState: NSOnState]; - } - - var_Change( p_object, psz_variable, VLC_VAR_FREELIST, - &val ); - - free( psz_value ); + + p_intf->b_die = VLC_TRUE; + [NSApp stop:NULL]; } - (IBAction)clearRecentItems:(id)sender @@ -1364,68 +1254,18 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) - (IBAction)viewPreferences:(id)sender { - if( o_prefs == nil ) - { - o_prefs = [[VLCPrefs alloc] init]; - } - - [o_prefs createPrefPanel: @"main"]; + [o_prefs showPrefs]; } -- (IBAction)timesliderUpdate:(id)sender +- (IBAction)closeError:(id)sender { - float f_updated; - - switch( [[NSApp currentEvent] type] ) - { - case NSLeftMouseUp: - case NSLeftMouseDown: - f_slider = [sender floatValue]; - return; - - case NSLeftMouseDragged: - f_updated = [sender floatValue]; - break; - - default: - return; - } - - intf_thread_t * p_intf = [NSApp getIntf]; - - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - - if( p_playlist == NULL ) - { - return; - } - - vlc_mutex_lock( &p_playlist->object_lock ); + vlc_value_t val; - if( p_playlist->p_input != NULL ) + if( [o_err_ckbk_surpress state] == NSOnState ) { - off_t i_tell; - NSString * o_time; - char psz_time[ OFFSETTOTIME_MAX_SIZE ]; - -#define p_area p_playlist->p_input->stream.p_selected_area - vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock ); - i_tell = f_updated / 10000. * p_area->i_size; - input_OffsetToTime( p_playlist->p_input, psz_time, i_tell ); - vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock ); -#undef p_area - - o_time = [NSString stringWithCString: psz_time]; - [o_timefield setStringValue: o_time]; + val.i_int = -1; + var_Set( p_intf->p_vlc, "verbose", val ); } - - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); -} - -- (IBAction)closeError:(id)sender -{ [o_err_msg setString: @""]; [o_error performClose: self]; } @@ -1439,6 +1279,14 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) withApplication: @"TextEdit"]; } +- (IBAction)openDocumentation:(id)sender +{ + NSURL * o_url = [NSURL URLWithString: + @"http://www.videolan.org/doc/"]; + + [[NSWorkspace sharedWorkspace] openURL: o_url]; +} + - (IBAction)reportABug:(id)sender { NSURL * o_url = [NSURL URLWithString: @@ -1449,7 +1297,7 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) - (IBAction)openWebsite:(id)sender { - NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"]; + NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"]; [[NSWorkspace sharedWorkspace] openURL: o_url]; } @@ -1509,11 +1357,17 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) - (BOOL)validateMenuItem:(NSMenuItem *)o_mi { + NSString *o_title = [o_mi title]; BOOL bEnabled = TRUE; - /* Recent Items Menu */ + if( [o_title isEqualToString: _NS("License")] ) + { + /* we need to do this only once */ + [self setupMenus]; + } - if( [[o_mi title] isEqualToString: _NS("Clear Menu")] ) + /* Recent Items Menu */ + if( [o_title isEqualToString: _NS("Clear Menu")] ) { NSMenu * o_menu = [o_mi_open_recent submenu]; int i_nb_items = [o_menu numberOfItems]; @@ -1566,7 +1420,6 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) bEnabled = FALSE; } } - return( bEnabled ); }