X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=1d5ba9aced404472b433f9b1dc2e6f51faeedc80;hb=03d18c98e8576eab70efae9100279861bd657650;hp=90b2c0e2479300d12017ec28d193f243e0b27dfe;hpb=1da4377704e907d5e20a7b6d1bf7a9ff439389e1;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 90b2c0e247..1d5ba9aced 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,11 +1,12 @@ /***************************************************************************** * intf.m: MacOS X interface plugin ***************************************************************************** - * Copyright (C) 2002 VideoLAN - * $Id: intf.m,v 1.20 2003/01/06 22:07:47 massiot Exp $ + * Copyright (C) 2002-2003 VideoLAN + * $Id: intf.m,v 1.98 2003/11/03 15:27:28 hartman Exp $ * * Authors: Jon Lech Johansen * Christophe Massiot + * 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 @@ -28,18 +29,19 @@ #include /* malloc(), free() */ #include /* for MAXPATHLEN */ #include - -#include +#include #include "intf.h" #include "vout.h" #include "prefs.h" #include "playlist.h" +#include "info.h" +#include "controls.h" /***************************************************************************** * Local prototypes. *****************************************************************************/ -static void Run ( intf_thread_t *p_intf ); +static void Run ( intf_thread_t *p_intf ); /***************************************************************************** * OpenIntf: initialize interface @@ -55,16 +57,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]; + + /* 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->pf_run = Run; - + [[VLCApplication sharedApplication] autorelease]; - [NSApp initIntlSupport]; [NSApp setIntf: p_intf]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; @@ -92,6 +98,11 @@ void E_(CloseIntf) ( vlc_object_t *p_this ) *****************************************************************************/ static void Run( intf_thread_t *p_intf ) { + /* Do it again - for some unknown reason, vlc_thread_create() often + * fails to go to real-time priority with the first launched thread + * (???) --Meuuh */ + vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); + [NSApp run]; } @@ -100,46 +111,89 @@ static void Run( intf_thread_t *p_intf ) *****************************************************************************/ @implementation VLCApplication -- (id)init -{ - /* default encoding: ISO-8859-1 */ - i_encoding = NSISOLatin1StringEncoding; - - return( [super init] ); -} - -- (void)initIntlSupport +- (NSString *)localizedString:(char *)psz { - char *psz_lang = getenv( "LANG" ); + NSString * o_str = nil; - if( psz_lang == NULL ) + if( psz != NULL ) { - return; + o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease]; } - - if( strncmp( psz_lang, "pl", 2 ) == 0 ) + if ( o_str == NULL ) { - i_encoding = NSISOLatin2StringEncoding; + msg_Err( p_intf, "could not translate: %s", psz ); } - else if( strncmp( psz_lang, "ja", 2 ) == 0 ) + + return( o_str ); +} + +- (char *)delocalizeString:(NSString *)id +{ + NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding + allowLossyConversion: NO]; + char * psz_string; + + if ( o_data == nil ) { - i_encoding = NSJapaneseEUCStringEncoding; + 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( p_intf, "cannot convert to wanted encoding: %s", + psz_string ); } - else if( strncmp( psz_lang, "ru", 2 ) == 0 ) + else { -#define CFSENC2NSSENC(e) CFStringConvertEncodingToNSStringEncoding(e) - i_encoding = CFSENC2NSSENC( kCFStringEncodingKOI8_R ); -#undef CFSENC2NSSENC + psz_string = malloc( [o_data length] + 1 ); + [o_data getBytes: psz_string]; + psz_string[ [o_data length] ] = '\0'; } + + return psz_string; } -- (NSString *)localizedString:(char *)psz +/* i_width is in pixels */ +- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width { - UInt32 uiLength = (UInt32)strlen( psz ); - NSData * o_data = [NSData dataWithBytes: psz length: uiLength]; - NSString *o_str = [[NSString alloc] initWithData: o_data - encoding: i_encoding]; - return( [o_str autorelease] ); + 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; } - (void)setIntf:(intf_thread_t *)_p_intf @@ -154,59 +208,174 @@ static void Run( intf_thread_t *p_intf ) - (void)terminate:(id)sender { - [self getIntf]->p_vlc->b_die = VLC_TRUE; + 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]; + + if( [target respondsToSelector: @selector(performSelectorOnMainThread: + withObject:waitUntilDone:)] ) + { + [target performSelectorOnMainThread: sel + withObject: [NSValue valueWithPointer: p_arg] + waitUntilDone: YES]; + } + else if( NSApp != nil && [NSApp respondsToSelector: @selector(getIntf)] ) + { + NSValue * o_v1; + NSValue * o_v2; + NSArray * o_array; + NSPort * o_recv_port; + NSInvocation * o_inv; + NSPortMessage * o_msg; + intf_thread_t * p_intf; + NSConditionLock * o_lock; + NSMethodSignature * o_sig; + + id * val[] = { &o_lock, &o_v2 }; + + p_intf = (intf_thread_t *)[NSApp getIntf]; + + o_recv_port = [[NSPort port] retain]; + o_v1 = [NSValue valueWithPointer: val]; + o_v2 = [NSValue valueWithPointer: p_arg]; + + o_sig = [target methodSignatureForSelector: sel]; + o_inv = [NSInvocation invocationWithMethodSignature: o_sig]; + [o_inv setArgument: &o_v1 atIndex: 2]; + [o_inv setTarget: target]; + [o_inv setSelector: sel]; + + o_array = [NSArray arrayWithObject: + [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]]; + o_msg = [[NSPortMessage alloc] + initWithSendPort: p_intf->p_sys->o_sendport + receivePort: o_recv_port components: o_array]; + + o_lock = [[NSConditionLock alloc] initWithCondition: 0]; + [o_msg sendBeforeDate: [NSDate distantPast]]; + [o_lock lockWhenCondition: 1]; + [o_lock unlock]; + [o_lock release]; + + [o_msg release]; + [o_recv_port release]; + } + else + { + i_ret = 1; + } + + [o_pool release]; + + return( i_ret ); +} + /***************************************************************************** - * VLCMain implementation + * playlistChanged: Callback triggered by the intf-change playlist + * variable, to let the intf update the playlist. *****************************************************************************/ -@implementation VLCMain - -- (id)init +int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, + vlc_value_t old_val, vlc_value_t new_val, void *param ) { - self = [super init]; + intf_thread_t * p_intf = [NSApp getIntf]; + p_intf->p_sys->b_playlist_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = VLC_TRUE; + return VLC_SUCCESS; +} - if( self != nil ) +static struct +{ + unichar i_nskey; + 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} +}; + +int CocoaConvertKey( unichar i_key ) +{ + int i; + + for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ ) { - o_prefs = nil; + if( nskeys_to_vlckeys[i].i_nskey == i_key ) + { + return nskeys_to_vlckeys[i].i_vlckey; + } } - - return( self ); + return (int)i_key; } +/***************************************************************************** + * VLCMain implementation + *****************************************************************************/ +@implementation VLCMain + - (void)awakeFromNib { - NSString * pTitle = [NSString - stringWithCString: VOUT_TITLE " (Cocoa)"]; - - [o_window setTitle: pTitle]; + [o_window setTitle: _NS("VLC - Controller")]; + [o_window setExcludedFromWindowsMenu: TRUE]; /* button controls */ [o_btn_playlist setToolTip: _NS("Playlist")]; [o_btn_prev setToolTip: _NS("Previous")]; [o_btn_slower setToolTip: _NS("Slower")]; [o_btn_play setToolTip: _NS("Play")]; - [o_btn_pause setToolTip: _NS("Pause")]; [o_btn_stop setToolTip: _NS("Stop")]; [o_btn_faster setToolTip: _NS("Faster")]; [o_btn_next setToolTip: _NS("Next")]; [o_btn_prefs setToolTip: _NS("Preferences")]; + [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_btn_ok setTitle: _NS("Close")]; + [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_about setTitle: _NS("About VLC media player")]; + [o_mi_prefs setTitle: _NS("Preferences...")]; [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: _NS("File")]; + [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_disc setTitle: _NS("Open Disc...")]; @@ -221,763 +390,652 @@ static void Run( intf_thread_t *p_intf ) [o_mi_clear setTitle: _NS("Clear")]; [o_mi_select_all setTitle: _NS("Select All")]; - [o_mu_view setTitle: _NS("View")]; - [o_mi_playlist setTitle: _NS("Playlist")]; - [o_mi_messages setTitle: _NS("Messages")]; - [o_mu_controls setTitle: _NS("Controls")]; [o_mi_play setTitle: _NS("Play")]; - [o_mi_pause setTitle: _NS("Pause")]; [o_mi_stop setTitle: _NS("Stop")]; [o_mi_faster setTitle: _NS("Faster")]; [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("Shuffle")]; + [o_mi_repeat setTitle: _NS("Repeat Item")]; + [o_mi_loop setTitle: _NS("Repeat Playlist")]; + [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_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_mi_program setTitle: _NS("Program")]; - [o_mi_title setTitle: _NS("Title")]; - [o_mi_chapter setTitle: _NS("Chapter")]; - [o_mi_language setTitle: _NS("Language")]; - [o_mi_subtitle setTitle: _NS("Subtitles")]; + [o_mu_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_window setTitle: _NS("Window")]; [o_mi_minimize setTitle: _NS("Minimize Window")]; [o_mi_close_window setTitle: _NS("Close Window")]; + [o_mi_controller setTitle: _NS("Controller")]; + [o_mi_playlist setTitle: _NS("Playlist")]; + [o_mi_info setTitle: _NS("Info")]; + [o_mi_messages setTitle: _NS("Messages")]; + [o_mi_bring_atf setTitle: _NS("Bring All to Front")]; + [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")]; + /* dock menu */ [o_dmi_play setTitle: _NS("Play")]; - [o_dmi_pause setTitle: _NS("Pause")]; [o_dmi_stop setTitle: _NS("Stop")]; + [o_dmi_next setTitle: _NS("Next")]; + [o_dmi_previous setTitle: _NS("Previous")]; /* error panel */ [o_error setTitle: _NS("Error")]; - [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request :")]; - [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at :")]; + [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")]; + [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")]; - [self manageMode]; + [o_info_window setTitle: _NS("Info")]; + + [self setSubmenusEnabled: FALSE]; + [self manageVolumeSlider]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification { intf_thread_t * p_intf = [NSApp getIntf]; - f_slider_old = f_slider = 0.0; - o_slider_lock = [[NSLock alloc] init]; + o_msg_lock = [[NSLock alloc] init]; + o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain]; - [NSThread detachNewThreadSelector: @selector(manage) - toTarget: self withObject: nil]; + o_img_play = [[NSImage imageNamed: @"play"] retain]; + o_img_pause = [[NSImage imageNamed: @"pause"] retain]; [p_intf->p_sys->o_sendport setDelegate: self]; [[NSRunLoop currentRunLoop] addPort: p_intf->p_sys->o_sendport forMode: NSDefaultRunLoopMode]; + + [NSTimer scheduledTimerWithTimeInterval: 0.5 + target: self selector: @selector(manageIntf:) + userInfo: nil repeats: FALSE]; + + [NSThread detachNewThreadSelector: @selector(manage) + toTarget: self withObject: nil]; + + 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]; - + [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO]; + return( TRUE ); } +- (id)getControls +{ + if ( o_controls ) + { + return o_controls; + } + 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 ) { - int i_start, i_stop; + playlist_t * p_playlist; vlc_mutex_lock( &p_intf->change_lock ); - /* update the input */ - if( p_intf->p_sys->p_input == NULL ) - { - p_intf->p_sys->p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); - } - else if( p_intf->p_sys->p_input->b_dead ) - { - vlc_object_release( p_intf->p_sys->p_input ); - p_intf->p_sys->p_input = NULL; - } + p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die ) + if( p_playlist != NULL ) { - vlc_bool_t b_need_menus = 0; - input_thread_t * p_input = p_intf->p_sys->p_input; - aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); - vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - - /* Disable screen saver. */ - UpdateSystemActivity( UsrActivity ); - - vlc_mutex_lock( &p_input->stream.stream_lock ); - - [self displayTime]; - - /* New input or stream map change */ - if( p_input->stream.b_changed ) - { - [self manageMode]; - b_need_menus = 1; - p_intf->p_sys->b_playing = 1; - } - - 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 = 1; - } - - if ( p_aout != NULL ) - { - vlc_value_t val; - 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 = 1; - } - vlc_object_release( (vlc_object_t *)p_aout ); - } - - if ( p_vout != NULL ) - { - vlc_value_t val; - 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 = 1; - } - vlc_object_release( (vlc_object_t *)p_vout ); - } - - if ( b_need_menus ) - [self setupMenus]; - - vlc_mutex_unlock( &p_input->stream.stream_lock ); - } - else if( p_intf->p_sys->b_playing && !p_intf->b_die ) - { - [self displayTime]; - [self manageMode]; - p_intf->p_sys->b_playing = 0; - - if ( p_intf->p_sys->b_stopping ) + var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); +#define p_input p_playlist->p_input + + if( p_input ) { - vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); - - if ( p_vout != NULL ) + if( !p_input->b_die ) { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vout_Destroy( p_vout ); + vlc_value_t val; + + /* New input or stream map change */ + if( p_input->stream.b_changed ) + { + msg_Dbg( p_intf, "stream has changed, refreshing interface" ); + p_intf->p_sys->b_playing = TRUE; + p_intf->p_sys->b_current_title_update = 1; + p_input->stream.b_changed = 0; + p_intf->p_sys->b_intf_update = TRUE; + } + + if( var_Get( (vlc_object_t *)p_input, "intf-change", &val ) + >= 0 && val.b_bool ) + { + p_intf->p_sys->b_input_update = TRUE; + } } - p_intf->p_sys->b_stopping = 0; } - } - - /* update the log window */ - vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); - i_stop = *p_intf->p_sys->p_sub->pi_stop; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); - - if( p_intf->p_sys->p_sub->i_start != i_stop ) - { - NSColor *o_white = [NSColor whiteColor]; - NSColor *o_red = [NSColor redColor]; - NSColor *o_yellow = [NSColor yellowColor]; - NSColor *o_gray = [NSColor grayColor]; - - unsigned int ui_length = [[o_messages string] length]; - - NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray }; - static const char * ppsz_type[4] = { ": ", " error: ", - " warning: ", " debug: " }; - - [o_messages setEditable: YES]; - [o_messages setSelectedRange: NSMakeRange( ui_length, 0 )]; - [o_messages scrollRangeToVisible: NSMakeRange( ui_length, 0 )]; - - for( i_start = p_intf->p_sys->p_sub->i_start; - i_start != i_stop; - i_start = (i_start+1) % VLC_MSG_QSIZE ) + else if( p_intf->p_sys->b_playing && !p_intf->b_die ) { - NSString *o_msg; - NSDictionary *o_attr; - NSAttributedString *o_msg_color; - int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type; - - o_attr = [NSDictionary dictionaryWithObject: o_gray - forKey: NSForegroundColorAttributeName]; - o_msg = [NSString stringWithFormat: @"%s%s", - p_intf->p_sys->p_sub->p_msg[i_start].psz_module, - ppsz_type[i_type]]; - o_msg_color = [[NSAttributedString alloc] - initWithString: o_msg attributes: o_attr]; - [o_messages insertText: o_msg_color]; - - o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] - forKey: NSForegroundColorAttributeName]; - o_msg = [NSString stringWithCString: - p_intf->p_sys->p_sub->p_msg[i_start].psz_msg]; - o_msg_color = [[NSAttributedString alloc] - initWithString: o_msg attributes: o_attr]; - [o_messages insertText: o_msg_color]; - - [o_messages insertText: @"\n"]; - - if ( i_type == 1 ) - { - /* Error panel */ - NSString *o_my_msg = - [NSString stringWithFormat: @"%s: %s\n", - p_intf->p_sys->p_sub->p_msg[i_start].psz_module, - p_intf->p_sys->p_sub->p_msg[i_start].psz_msg]; - - [o_err_msg setEditable: YES]; - [o_err_msg setSelectedRange: - NSMakeRange( [[o_err_msg string] length], 0 )]; - [o_err_msg insertText: o_my_msg]; - - [o_error makeKeyAndOrderFront: self]; - [o_err_msg setEditable: NO]; - } + p_intf->p_sys->b_playing = FALSE; + p_intf->p_sys->b_intf_update = TRUE; } - - [o_messages setEditable: NO]; - - vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); - p_intf->p_sys->p_sub->i_start = i_start; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); + +#undef p_input + vlc_object_release( p_playlist ); } vlc_mutex_unlock( &p_intf->change_lock ); - o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: 0.1]; + o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5]; [NSThread sleepUntilDate: o_sleep_date]; } [self terminate]; - [o_pool release]; } -- (void)terminate +- (void)manageIntf:(NSTimer *)o_timer { - NSEvent * pEvent; - vout_thread_t * p_vout; - playlist_t * p_playlist; intf_thread_t * p_intf = [NSApp getIntf]; - /* release input */ - if( p_intf->p_sys->p_input ) + if( p_intf->p_vlc->b_die == VLC_TRUE ) { - vlc_object_release( p_intf->p_sys->p_input ); - p_intf->p_sys->p_input = NULL; + [o_timer invalidate]; + return; } - if( o_prefs != nil ) - { - [o_prefs release]; - o_prefs = nil; - } + playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, + FIND_ANYWHERE ); - /* - * Free playlists - */ - msg_Dbg( p_intf, "removing all playlists" ); - while( (p_playlist = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_PLAYLIST, - FIND_CHILD )) ) + if( p_playlist == NULL ) { - vlc_object_detach( p_playlist ); - vlc_object_release( p_playlist ); - playlist_Destroy( p_playlist ); + return; } - /* - * 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 )) ) + if ( p_intf->p_sys->b_playlist_update ) { - vlc_object_detach( p_vout ); - vlc_object_release( p_vout ); - vout_Destroy( p_vout ); + [o_playlist playlistUpdated]; + p_intf->p_sys->b_playlist_update = VLC_FALSE; } - [o_slider_lock release]; - - if( o_prefs != nil ) + if( p_intf->p_sys->b_current_title_update ) { - [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 */ - pEvent = [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: pEvent atStart: YES]; -} - -- (void)manageMode -{ - vlc_bool_t b_input; - vlc_bool_t b_plmul = 0; - vlc_bool_t b_control = 0; - playlist_t * p_playlist = NULL; - intf_thread_t * p_intf = [NSApp getIntf]; + vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + if( p_vout != NULL ) + { + id o_vout_wnd; + NSEnumerator * o_enum = [[NSApp windows] 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]; + [o_info updateInfo]; - if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) ) - { - /* control buttons for free pace streams */ - b_control = p_intf->p_sys->p_input->stream.b_pace_control; - - /* 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->i_part = 0; - - p_intf->p_sys->p_input->stream.b_changed = 0; - msg_Dbg( p_intf, "stream has changed, refreshing interface" ); - } - else - { - /* unsensitize menus */ - [o_mi_program setEnabled: FALSE]; - [o_mi_title setEnabled: FALSE]; - [o_mi_chapter setEnabled: FALSE]; - [o_mi_language setEnabled: FALSE]; - [o_mi_subtitle setEnabled: FALSE]; - [o_mi_channels setEnabled: FALSE]; - [o_mi_device setEnabled: FALSE]; - [o_mi_screen setEnabled: FALSE]; - [o_mi_close_window setEnabled: FALSE]; + p_intf->p_sys->b_current_title_update = FALSE; } - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist != NULL ) - { - vlc_mutex_lock( &p_playlist->object_lock ); - b_plmul = p_playlist->i_size > 1; - vlc_mutex_unlock( &p_playlist->object_lock ); - vlc_object_release( p_playlist ); - } + vlc_mutex_lock( &p_playlist->object_lock ); - /* set control items */ - [o_btn_stop setEnabled: b_input]; - [o_btn_pause setEnabled: b_control]; - [o_btn_faster setEnabled: b_control]; - [o_btn_slower setEnabled: b_control]; - [o_btn_prev setEnabled: b_plmul]; - [o_btn_next setEnabled: b_plmul]; +#define p_input p_playlist->p_input - if ( (p_intf->p_sys->b_loop = config_GetInt( p_intf, "loop" )) ) - { - [o_mi_loop setState: NSOnState]; - } - else + if( p_intf->p_sys->b_intf_update ) { - [o_mi_loop setState: NSOffState]; - } -} - -- (void)setupMenus -{ - unsigned int i, i_nb_items; - NSMenuItem * o_item; - NSString * o_menu_title; - char psz_title[ 256 ]; + vlc_bool_t b_input = VLC_FALSE; + vlc_bool_t b_plmul = VLC_FALSE; + vlc_bool_t b_control = VLC_FALSE; + vlc_bool_t b_seekable = VLC_FALSE; + vlc_bool_t b_chapters = VLC_FALSE; + vlc_value_t val; - es_descriptor_t * p_audio_es = NULL; - es_descriptor_t * p_spu_es = NULL; + b_plmul = p_playlist->i_size > 1; - intf_thread_t * p_intf = [NSApp getIntf]; + if( ( b_input = ( p_input != NULL ) ) ) + { + vlc_mutex_lock( &p_input->stream.stream_lock ); - 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; + /* seekable streams */ + b_seekable = p_input->stream.b_seekable; -#define p_input (p_intf->p_sys->p_input) + /* control buttons for free pace streams */ + b_control = p_input->stream.b_pace_control; - if( p_intf->p_sys->b_program_update ) - { - NSMenu * o_program; - SEL pf_toggle_program; - pgrm_descriptor_t * p_pgrm; + /* chapters & titles */ + b_chapters = p_input->stream.i_area_nb > 1; + + vlc_mutex_unlock( &p_input->stream.stream_lock ); - if( p_input->stream.p_new_program ) - { - p_pgrm = p_input->stream.p_new_program; + /* play status */ + var_Get( p_input, "state", &val ); + p_intf->p_sys->b_play_status = val.i_int != PAUSE_S; } else { - p_pgrm = p_input->stream.p_selected_program; + /* play status */ + p_intf->p_sys->b_play_status = FALSE; + [self setSubmenusEnabled: FALSE]; } - 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'; + [self playStatusUpdated: p_intf->p_sys->b_play_status]; - o_menu_title = [NSString stringWithCString: psz_title]; + [o_btn_stop setEnabled: b_input]; + [o_btn_faster setEnabled: b_control]; + [o_btn_slower setEnabled: b_control]; + [o_btn_prev setEnabled: (b_plmul || b_chapters)]; + [o_btn_next setEnabled: (b_plmul || b_chapters)]; - 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]; + [o_timeslider setFloatValue: 0.0]; + [o_timeslider setEnabled: b_seekable]; + [o_timefield setStringValue: @"0:00:00"]; - if( p_pgrm == p_input->stream.pp_programs[i] ) - { - [o_item setState: NSOnState]; - } - } + [self manageVolumeSlider]; - p_intf->p_sys->b_program_update = 0; + p_intf->p_sys->b_intf_update = VLC_FALSE; } - if( p_intf->p_sys->b_title_update ) + if( p_intf->p_sys->b_playing && p_input != NULL ) { - NSMenu * o_title; - SEL pf_toggle_title; - - o_title = [o_mi_title submenu]; - pf_toggle_title = @selector(toggleTitle:); + vlc_value_t time, val; + NSString * o_time; + mtime_t i_seconds; + var_Get( p_input, "state", &val ); - /* remove previous title items */ - i_nb_items = [o_title numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) + if( !p_input->b_die && ( p_intf->p_sys->b_play_status != + ( val.i_int != PAUSE_S ) ) ) { - [o_title removeItemAtIndex: 0]; - } + p_intf->p_sys->b_play_status = + !p_intf->p_sys->b_play_status; - /* make (un)sensitive */ - [o_mi_title setEnabled: - p_input->stream.i_area_nb > 1]; + [self playStatusUpdated: p_intf->p_sys->b_play_status]; + } - /* add title items */ - for( i = 1 ; i < p_input->stream.i_area_nb ; i++ ) + if( p_input->stream.b_seekable ) { - 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 = [NSString stringWithCString: psz_title]; + vlc_value_t pos; + float f_updated; + + var_Get( p_input, "position", &pos ); + f_updated = 10000. * pos.f_float; - 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 ) ) + if( f_slider != f_updated ) { - [o_item setState: NSOnState]; + [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]; - p_intf->p_sys->b_title_update = 0; + /* disable screen saver */ + UpdateSystemActivity( UsrActivity ); } - if( p_intf->p_sys->b_chapter_update ) - { - NSMenu * o_chapter; - SEL pf_toggle_chapter; +#undef p_input - o_chapter = [o_mi_chapter submenu]; - pf_toggle_chapter = @selector(toggleChapter:); + vlc_mutex_unlock( &p_playlist->object_lock ); + vlc_object_release( p_playlist ); - /* remove previous chapter items */ - i_nb_items = [o_chapter numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_chapter removeItemAtIndex: 0]; - } + [self updateMessageArray]; - /* make (un)sensitive */ - [o_mi_chapter setEnabled: - p_input->stream.p_selected_area->i_part_nb > 1]; + [NSTimer scheduledTimerWithTimeInterval: 0.5 + target: self selector: @selector(manageIntf:) + userInfo: nil repeats: FALSE]; +} - /* add chapter items */ - for( i = 0 ; i < p_input->stream.p_selected_area->i_part_nb ; i++ ) +- (void)setupMenus +{ + 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 ) + { +#define p_input p_playlist->p_input + if( p_input != NULL ) { - snprintf( psz_title, sizeof(psz_title), "Chapter %d", i + 1 ); - psz_title[sizeof(psz_title) - 1] = '\0'; - - o_menu_title = [NSString stringWithCString: 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_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_item setState: NSOnState]; + [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 ); } } - - 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 == SPU_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]; - } +#undef p_input } + vlc_object_release( (vlc_object_t *)p_playlist ); +} - vlc_mutex_unlock( &p_input->stream.stream_lock ); - - if( p_intf->p_sys->b_audio_update ) - { - [self setupLangMenu: o_mi_language es: p_audio_es - category: AUDIO_ES selector: @selector(toggleLanguage:)]; +- (void)updateMessageArray +{ + int i_start, i_stop; + intf_thread_t * p_intf = [NSApp getIntf]; - p_intf->p_sys->b_audio_update = 0; - } + vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); + i_stop = *p_intf->p_sys->p_sub->pi_stop; + vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); - if( p_intf->p_sys->b_spu_update ) + if( p_intf->p_sys->p_sub->i_start != i_stop ) { - [self setupLangMenu: o_mi_subtitle es: p_spu_es - category: SPU_ES selector: @selector(toggleLanguage:)]; - - p_intf->p_sys->b_spu_update = 0; - } + NSColor *o_white = [NSColor whiteColor]; + NSColor *o_red = [NSColor redColor]; + NSColor *o_yellow = [NSColor yellowColor]; + NSColor *o_gray = [NSColor grayColor]; + + NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray }; + static const char * ppsz_type[4] = { ": ", " error: ", + " warning: ", " debug: " }; + + for( i_start = p_intf->p_sys->p_sub->i_start; + i_start != i_stop; + i_start = (i_start+1) % VLC_MSG_QSIZE ) + { + NSString *o_msg; + NSDictionary *o_attr; + NSAttributedString *o_msg_color; - if ( p_intf->p_sys->b_aout_update ) - { - aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type; - if ( p_aout != NULL ) - { - vlc_value_t val; - val.b_bool = 0; + [o_msg_lock lock]; - var_Set( (vlc_object_t *)p_aout, "intf-change", val ); + if( [o_msg_arr count] + 2 > 400 ) + { + unsigned rid[] = { 0, 1 }; + [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid + numIndices: sizeof(rid)/sizeof(rid[0])]; + } - [self setupVarMenu: o_mi_channels target: (vlc_object_t *)p_aout - var: "audio-channels" selector: @selector(toggleVar:)]; + o_attr = [NSDictionary dictionaryWithObject: o_gray + forKey: NSForegroundColorAttributeName]; + o_msg = [NSString stringWithFormat: @"%s%s", + p_intf->p_sys->p_sub->p_msg[i_start].psz_module, + ppsz_type[i_type]]; + o_msg_color = [[NSAttributedString alloc] + initWithString: o_msg attributes: o_attr]; + [o_msg_arr addObject: [o_msg_color autorelease]]; + + o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] + forKey: NSForegroundColorAttributeName]; + o_msg = [NSString stringWithFormat: @"%s\n", + p_intf->p_sys->p_sub->p_msg[i_start].psz_msg]; + o_msg_color = [[NSAttributedString alloc] + initWithString: o_msg attributes: o_attr]; + [o_msg_arr addObject: [o_msg_color autorelease]]; + + [o_msg_lock unlock]; + + if( i_type == 1 ) + { + NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n", + p_intf->p_sys->p_sub->p_msg[i_start].psz_module, + p_intf->p_sys->p_sub->p_msg[i_start].psz_msg]; - [self setupVarMenu: o_mi_device target: (vlc_object_t *)p_aout - var: "audio-device" selector: @selector(toggleVar:)]; + NSRange s_r = NSMakeRange( [[o_err_msg string] length], 0 ); + [o_err_msg setEditable: YES]; + [o_err_msg setSelectedRange: s_r]; + [o_err_msg insertText: o_my_msg]; - vlc_object_release( (vlc_object_t *)p_aout ); + [o_error makeKeyAndOrderFront: self]; + [o_err_msg setEditable: NO]; + } } - p_intf->p_sys->b_aout_update = 0; + vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); + p_intf->p_sys->p_sub->i_start = i_start; + vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); } +} - if ( p_intf->p_sys->b_vout_update ) +- (void)playStatusUpdated:(BOOL)b_pause +{ + if( b_pause ) { - 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; + [o_btn_play setImage: o_img_pause]; + [o_btn_play setToolTip: _NS("Pause")]; + [o_mi_play setTitle: _NS("Pause")]; + [o_dmi_play setTitle: _NS("Pause")]; } + else + { + [o_btn_play setImage: o_img_play]; + [o_btn_play setToolTip: _NS("Play")]; + [o_mi_play setTitle: _NS("Play")]; + [o_dmi_play setTitle: _NS("Play")]; + } +} - vlc_mutex_lock( &p_input->stream.stream_lock ); - -#undef p_input +- (void)setSubmenusEnabled:(BOOL)b_enabled +{ + [o_mi_program setEnabled: b_enabled]; + [o_mi_title setEnabled: b_enabled]; + [o_mi_chapter setEnabled: b_enabled]; + [o_mi_audiotrack 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]; } -- (void)setupLangMenu:(NSMenuItem *)o_mi - es:(es_descriptor_t *)p_es - category:(int)i_cat - selector:(SEL)pf_callback +- (void)manageVolumeSlider { - unsigned int i, i_nb_items; - NSMenu * o_menu = [o_mi submenu]; + audio_volume_t i_volume; intf_thread_t * p_intf = [NSApp getIntf]; - /* remove previous language items */ - i_nb_items = [o_menu numberOfItems]; - for( i = 0; i < i_nb_items; i++ ) - { - [o_menu removeItemAtIndex: 0]; - } + aout_VolumeGet( p_intf, &i_volume ); - /* 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]; + [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP]; + [o_volumeslider setEnabled: TRUE]; - vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock ); + p_intf->p_sys->b_mute = ( i_volume == 0 ); +} -#define ES p_intf->p_sys->p_input->stream.pp_es[i] - for( i = 0 ; i < p_intf->p_sys->p_input->stream.i_es_number ; i++ ) - { - if( ( ES->i_cat == i_cat ) && - ( !ES->p_pgrm || - ES->p_pgrm == - p_intf->p_sys->p_input->stream.p_selected_program ) ) - { - NSMenuItem * o_lmi; - NSString * o_title; +- (IBAction)timesliderUpdate:(id)sender +{ + intf_thread_t * p_intf; + input_thread_t * p_input; + float f_updated; - if( *ES->psz_desc ) - { - o_title = [NSString stringWithCString: ES->psz_desc]; - } - else - { - char psz_title[ 256 ]; + switch( [[NSApp currentEvent] type] ) + { + case NSLeftMouseUp: + case NSLeftMouseDown: + case NSLeftMouseDragged: + f_updated = [sender floatValue]; + break; - snprintf( psz_title, sizeof(psz_title), "Language 0x%x", - ES->i_id ); - psz_title[sizeof(psz_title) - 1] = '\0'; + default: + return; + } - o_title = [NSString stringWithCString: psz_title]; - } + p_intf = [NSApp getIntf]; + p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT, + FIND_ANYWHERE ); - 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_input != NULL ) + { + vlc_value_t time; + mtime_t i_seconds; + NSString * o_time; - if( /*p_es == ES*/ ES->p_decoder_fifo != NULL ) - { - [o_lmi setState: NSOnState]; - } + if( p_input->stream.b_seekable ) + { + vlc_value_t pos; + pos.f_float = f_updated / 10000.; + if( f_slider != f_updated ) + { + 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 ); } -#undef ES - - vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock ); } -- (void)setupVarMenu:(NSMenuItem *)o_mi - target:(vlc_object_t *)p_object - var:(const char *)psz_variable - selector:(SEL)pf_callback +- (void)terminate { - 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++ ) + NSEvent * o_event; + 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 )) ) { - [o_menu removeItemAtIndex: 0]; + vlc_object_detach( p_playlist ); + vlc_object_release( p_playlist ); + playlist_Destroy( p_playlist ); } - if ( var_Get( p_object, psz_variable, &val ) < 0 ) + if( o_img_pause != nil ) { - return; + [o_img_pause release]; + o_img_pause = nil; } - psz_value = val.psz_string; - if ( var_Change( p_object, psz_variable, - VLC_VAR_GETLIST, &val ) < 0 ) + if( o_img_play != nil ) { - free( psz_value ); - return; + [o_img_play release]; + o_img_play = nil; } - /* make (un)sensitive */ - [o_mi setEnabled: (val.p_list->i_count > 0)]; + if( o_msg_arr != nil ) + { + [o_msg_arr removeAllObjects]; + [o_msg_arr release]; + o_msg_arr = nil; + } - for ( i = 0; i < val.p_list->i_count; i++ ) + if( o_msg_lock != nil ) { - NSMenuItem * o_lmi; - NSString * o_title; - - o_title = [NSString stringWithCString: 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]; + [o_msg_lock release]; + o_msg_lock = nil; } - var_Change( p_object, psz_variable, VLC_VAR_FREELIST, - &val ); + [NSApp stop: nil]; + + /* write cached user defaults to disk */ + [[NSUserDefaults standardUserDefaults] synchronize]; - free( psz_value ); + /* 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]; } - (IBAction)clearRecentItems:(id)sender @@ -993,101 +1051,94 @@ static void Run( intf_thread_t *p_intf ) - (IBAction)viewPreferences:(id)sender { - if( o_prefs == nil ) - { - o_prefs = [[VLCPrefs alloc] init]; - } + [o_prefs showPrefs]; +} - [o_prefs createPrefPanel: @"main"]; +- (IBAction)closeError:(id)sender +{ + [o_err_msg setString: @""]; + [o_error performClose: self]; } -- (IBAction)timesliderUpdate:(id)sender +- (IBAction)openReadMe:(id)sender { - switch( [[NSApp currentEvent] type] ) - { - case NSLeftMouseDown: - [o_slider_lock lock]; - break; + NSString * o_path = [[NSBundle mainBundle] + pathForResource: @"README.MacOSX" ofType: @"rtf"]; - case NSLeftMouseUp: - f_slider = [sender floatValue]; - [o_slider_lock unlock]; - break; + [[NSWorkspace sharedWorkspace] openFile: o_path + withApplication: @"TextEdit"]; +} - default: - break; - } +- (IBAction)openDocumentation:(id)sender +{ + NSURL * o_url = [NSURL URLWithString: + @"http://www.videolan.org/doc/"]; + + [[NSWorkspace sharedWorkspace] openURL: o_url]; } -- (void)displayTime +- (IBAction)reportABug:(id)sender { - intf_thread_t * p_intf = [NSApp getIntf]; - input_thread_t * p_input = p_intf->p_sys->p_input; + NSURL * o_url = [NSURL URLWithString: + @"http://www.videolan.org/support/bug-reporting.html"]; - if( p_input == NULL ) - { - [o_timeslider setEnabled: FALSE]; - [o_timeslider setFloatValue: 0.0]; - [o_timefield setStringValue: @"0:00:00"]; + [[NSWorkspace sharedWorkspace] openURL: o_url]; +} - return; - } +- (IBAction)openWebsite:(id)sender +{ + NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"]; -#define p_area p_input->stream.p_selected_area + [[NSWorkspace sharedWorkspace] openURL: o_url]; +} - if( p_input->stream.b_changed ) +- (IBAction)openLicense:(id)sender +{ + NSString * o_path = [[NSBundle mainBundle] + pathForResource: @"COPYING" ofType: nil]; + + [[NSWorkspace sharedWorkspace] openFile: o_path + withApplication: @"TextEdit"]; +} + +- (IBAction)openCrashLog:(id)sender +{ + NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log" + stringByExpandingTildeInPath]; + + + if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) { - [o_timeslider setEnabled: p_input->stream.b_seekable]; + [[NSWorkspace sharedWorkspace] openFile: o_path + withApplication: @"Console"]; } - else if( p_intf->p_sys->b_playing ) + else { - NSString * o_time; - char psz_time[ OFFSETTOTIME_MAX_SIZE ]; + NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Either you are running Mac OS X pre 10.2 or you haven't experienced any heavy crashes yet.") ); - input_OffsetToTime( p_input, psz_time, p_area->i_tell ); + } +} - o_time = [NSString stringWithCString: psz_time]; - [o_timefield setStringValue: o_time]; +- (void)windowDidBecomeKey:(NSNotification *)o_notification +{ + if( [o_notification object] == o_msgs_panel ) + { + id o_msg; + NSEnumerator * o_enum; - if( p_input->stream.b_seekable ) - { - if( f_slider == f_slider_old ) - { - float f_updated = ( 100. * p_area->i_tell ) / - p_area->i_size; + [o_messages setString: @""]; - if( f_slider != f_updated && [o_slider_lock tryLock] ) - { - [o_timeslider setFloatValue: f_updated]; - [o_slider_lock unlock]; - } - } - else - { - off_t i_seek = ( f_slider * p_area->i_size ) / 100; + [o_msg_lock lock]; - /* 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 ); + o_enum = [o_msg_arr objectEnumerator]; - /* Update the old value */ - f_slider_old = f_slider; - } + while( ( o_msg = [o_enum nextObject] ) != nil ) + { + [o_messages insertText: o_msg]; } - } -#undef p_area -} -- (IBAction)closeError:(id)sender -{ - /* Error panel */ - [o_err_msg setEditable: YES]; - [o_err_msg setSelectedRange: - NSMakeRange( 0, [[o_err_msg string] length] )]; - [o_err_msg insertText: @""]; - [o_err_msg setEditable: NO]; - [o_error performClose: self]; + [o_msg_lock unlock]; + } } @end @@ -1096,11 +1147,17 @@ static void Run( intf_thread_t *p_intf ) - (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]; @@ -1153,7 +1210,6 @@ static void Run( intf_thread_t *p_intf ) bEnabled = FALSE; } } - return( bEnabled ); } @@ -1163,19 +1219,22 @@ static void Run( intf_thread_t *p_intf ) - (void)handlePortMessage:(NSPortMessage *)o_msg { + id ** val; NSData * o_data; NSValue * o_value; NSInvocation * o_inv; - vout_thread_t * p_vout; + NSConditionLock * o_lock; o_data = [[o_msg components] lastObject]; o_inv = *((NSInvocation **)[o_data bytes]); [o_inv getArgument: &o_value atIndex: 2]; - p_vout = (vout_thread_t *)[o_value pointerValue]; + val = (id **)[o_value pointerValue]; + [o_inv setArgument: val[1] atIndex: 2]; + o_lock = *(val[0]); - [p_vout->p_sys->o_lock lock]; + [o_lock lock]; [o_inv invoke]; - [p_vout->p_sys->o_lock unlockWithCondition: 1]; + [o_lock unlockWithCondition: 1]; } @end