X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=c6f631b97ba7924a7f2795f58b7502d5c0a6faf0;hb=e16a922a514fa4d5adcb2bbd4b17ef6b1791035e;hp=e82aa20faea331abc2161cbc43501277a0234ccd;hpb=aa9bce0bc4a0c0d5bf7a5664ab5b24e5216dc19a;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index e82aa20fae..c6f631b97b 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -48,7 +48,6 @@ #import "wizard.h" #import "extended.h" #import "bookmarks.h" -#import "sfilters.h" #import "interaction.h" #import "embeddedwindow.h" #import "update.h" @@ -92,7 +91,7 @@ static void Run ( intf_thread_t *p_intf ); /***************************************************************************** * OpenIntf: initialize interface *****************************************************************************/ -int E_(OpenIntf) ( vlc_object_t *p_this ) +int OpenIntf ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; @@ -106,11 +105,9 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; - p_intf->p_sys->o_sendport = [[NSPort port] retain]; - p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); - p_intf->b_play = VLC_TRUE; + p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); p_intf->pf_run = Run; - p_intf->b_should_run_on_first_thread = VLC_TRUE; + p_intf->b_should_run_on_first_thread = true; return( 0 ); } @@ -118,7 +115,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) /***************************************************************************** * CloseIntf: destroy interface *****************************************************************************/ -void E_(CloseIntf) ( vlc_object_t *p_this ) +void CloseIntf ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; @@ -126,33 +123,11 @@ void E_(CloseIntf) ( vlc_object_t *p_this ) msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); - [p_intf->p_sys->o_sendport release]; [p_intf->p_sys->o_pool release]; free( p_intf->p_sys ); } -/***************************************************************************** - * KillerThread: Thread that kill the application - *****************************************************************************/ -static void * KillerThread( void *user_data ) -{ - NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - - intf_thread_t *p_intf = user_data; - - vlc_object_lock ( p_intf ); - while( vlc_object_alive( p_intf ) ) - vlc_object_wait( p_intf ); - vlc_object_unlock( p_intf ); - - msg_Dbg( p_intf, "Killing the Mac OS X module\n" ); - - /* We are dead, terminate */ - [NSApp terminate: nil]; - [o_pool release]; - return NULL; -} /***************************************************************************** * Run: main loop *****************************************************************************/ @@ -186,10 +161,6 @@ static void Run( intf_thread_t *p_intf ) [[VLCMain sharedInstance] setIntf: p_intf]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; - /* Setup a thread that will monitor the module killing */ - pthread_t killer_thread; - pthread_create( &killer_thread, NULL, KillerThread, p_intf ); - /* Install a jmpbuffer to where we can go back before the NSApp exit * see applicationWillTerminate: */ if(setjmp(jmpbuffer) == 0) @@ -198,68 +169,16 @@ static void Run( intf_thread_t *p_intf ) [o_pool release]; } -int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) +/***************************************************************************** + * ManageThread: An ugly thread that polls + *****************************************************************************/ +static void * ManageThread( void *user_data ) { - 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: NO]; - } - else if( NSApp != nil && [[VLCMain sharedInstance] 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 *)VLCIntf; - - 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]; + id self = user_data; - o_lock = [[NSConditionLock alloc] initWithCondition: 0]; - [o_msg sendBeforeDate: [NSDate distantPast]]; - [o_lock lockWhenCondition: 1]; - [o_lock unlock]; - [o_lock release]; + [self manage]; - [o_msg release]; - [o_recv_port release]; - } - else - { - i_ret = 1; - } - - //[o_pool release]; - - return( i_ret ); + return NULL; } /***************************************************************************** @@ -270,10 +189,10 @@ static 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 = VLC_TRUE; - p_intf->p_sys->b_intf_update = VLC_TRUE; - p_intf->p_sys->b_playmode_update = VLC_TRUE; - p_intf->p_sys->b_current_title_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = true; + p_intf->p_sys->b_playlist_update = true; + p_intf->p_sys->b_playmode_update = true; + p_intf->p_sys->b_current_title_update = true; return VLC_SUCCESS; } @@ -286,7 +205,7 @@ static int ShowController( 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_intf_show = VLC_TRUE; + p_intf->p_sys->b_intf_show = true; return VLC_SUCCESS; } @@ -298,7 +217,7 @@ static int FullscreenChanged( 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_fullscreen_update = VLC_TRUE; + p_intf->p_sys->b_fullscreen_update = true; return VLC_SUCCESS; } @@ -421,7 +340,7 @@ static VLCMain *_o_sharedMainInstance = nil; _o_sharedMainInstance = [super init]; o_about = [[VLAboutBox alloc] init]; - o_prefs = [[VLCPrefs alloc] init]; + o_prefs = nil; o_open = [[VLCOpen alloc] init]; o_wizard = [[VLCWizard alloc] init]; o_extended = nil; @@ -429,7 +348,6 @@ static VLCMain *_o_sharedMainInstance = nil; o_embedded_list = [[VLCEmbeddedList alloc] init]; o_interaction_list = [[VLCInteractionList alloc] init]; o_info = [[VLCInfo alloc] init]; - o_sfilters = nil; #ifdef UPDATE_CHECK o_update = [[VLCUpdate alloc] init]; #endif @@ -469,8 +387,9 @@ static VLCMain *_o_sharedMainInstance = nil; if( nib_main_loaded ) return; [self initStrings]; - [o_window setExcludedFromWindowsMenu: TRUE]; - [o_msgs_panel setExcludedFromWindowsMenu: TRUE]; + + [o_window setExcludedFromWindowsMenu: YES]; + [o_msgs_panel setExcludedFromWindowsMenu: YES]; [o_msgs_panel setDelegate: self]; i_key = config_GetInt( p_intf, "key-quit" ); @@ -531,6 +450,7 @@ static VLCMain *_o_sharedMainInstance = nil; var_Create( p_intf, "intf-change", VLC_VAR_BOOL ); [self setSubmenusEnabled: FALSE]; + [o_volumeslider setEnabled: YES]; [self manageVolumeSlider]; [o_window setDelegate: self]; @@ -546,7 +466,7 @@ static VLCMain *_o_sharedMainInstance = nil; else { b_small_window = NO; - [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - 105 )]; + [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - 95 )]; [o_playlist_view setNeedsDisplay:YES]; [o_playlist_view setAutoresizesSubviews: YES]; [[o_window contentView] addSubview: o_playlist_view]; @@ -557,25 +477,20 @@ static VLCMain *_o_sharedMainInstance = nil; p_playlist = pl_Yield( p_intf ); - /* Check if we need to start playing */ - if( p_intf->b_play ) - { - playlist_Control( p_playlist, PLAYLIST_PLAY, VLC_FALSE ); - } var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); - val.b_bool = VLC_FALSE; + val.b_bool = false; var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self); - var_AddCallback( p_playlist, "intf-show", ShowController, self); + var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "interaction", InteractCallback, self ); - p_intf->b_interaction = VLC_TRUE; + p_intf->b_interaction = true; /* update the playmode stuff */ - p_intf->p_sys->b_playmode_update = VLC_TRUE; + p_intf->p_sys->b_playmode_update = true; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(refreshVoutDeviceMenu:) @@ -595,6 +510,67 @@ static VLCMain *_o_sharedMainInstance = nil; nib_main_loaded = TRUE; } +#pragma mark Toolbar delegate +/* Our item identifiers */ +static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; + +- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar +{ + return [NSArray arrayWithObjects: +// NSToolbarCustomizeToolbarItemIdentifier, +// NSToolbarFlexibleSpaceItemIdentifier, +// NSToolbarSpaceItemIdentifier, +// NSToolbarSeparatorItemIdentifier, + VLCToolbarMediaControl, + nil ]; +} + +- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar +{ + return [NSArray arrayWithObjects: + VLCToolbarMediaControl, + nil ]; +} + +- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag +{ + NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease]; + + + if( [itemIdentifier isEqual: VLCToolbarMediaControl] ) + { + [toolbarItem setLabel:@"Media Controls"]; + [toolbarItem setPaletteLabel:@"Media Controls"]; + + NSSize size = toolbarMediaControl.frame.size; + [toolbarItem setView:toolbarMediaControl]; + [toolbarItem setMinSize:size]; + size.width += 1000.; + [toolbarItem setMaxSize:size]; + + // Hack: For some reason we need to make sure + // that the those element are on top + // Add them again will put them frontmost + [toolbarMediaControl addSubview:o_scrollfield]; + [toolbarMediaControl addSubview:o_timeslider]; + [toolbarMediaControl addSubview:o_timefield]; + [toolbarMediaControl addSubview:o_main_pgbar]; + + /* TODO: setup a menu */ + } + else + { + /* itemIdentifier referred to a toolbar item that is not + * provided or supported by us or Cocoa + * Returning nil will inform the toolbar + * that this kind of item is not supported */ + toolbarItem = nil; + } + return toolbarItem; +} + +#pragma mark - + - (void)controlTintChanged { BOOL b_playing = NO; @@ -639,7 +615,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)initStrings { - [o_window setTitle: _NS("VLC - Controller")]; + [o_window setTitle: _NS("VLC")]; [self setScrollField:_NS("VLC media player") stopAfter:-1]; /* button controls */ @@ -676,6 +652,7 @@ static VLCMain *_o_sharedMainInstance = nil; [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_capture setTitle: _NS("Open Capture Device...")]; [o_mi_open_recent setTitle: _NS("Open Recent")]; [o_mi_open_recent_cm setTitle: _NS("Clear Menu")]; [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")]; @@ -734,8 +711,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")]; [o_mi_crop setTitle: _NS("Crop")]; [o_mu_crop setTitle: _NS("Crop")]; - [o_mi_screen setTitle: _NS("Video Device")]; - [o_mu_screen setTitle: _NS("Video Device")]; + [o_mi_screen setTitle: _NS("Fullscreen Video Device")]; + [o_mu_screen setTitle: _NS("Fullscreen Video Device")]; [o_mi_subtitle setTitle: _NS("Subtitles Track")]; [o_mu_subtitle setTitle: _NS("Subtitles Track")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")]; @@ -790,17 +767,13 @@ static VLCMain *_o_sharedMainInstance = nil; o_msg_lock = [[NSLock alloc] init]; o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] 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]; + /* FIXME: don't poll */ + interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5 + target: self selector: @selector(manageIntf:) + userInfo: nil repeats: FALSE] retain]; - [NSThread detachNewThreadSelector: @selector(manage) - toTarget: self withObject: nil]; + /* Note: we use the pthread API to support pre-10.5 */ + pthread_create( &manage_thread, NULL, ManageThread, self ); [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf var: "intf-add" selector: @selector(toggleVar:)]; @@ -881,6 +854,8 @@ static VLCMain *_o_sharedMainInstance = nil; /* Handle sleep notification */ [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:) name:NSWorkspaceWillSleepNotification object:nil]; + + [self performSelectorInBackground:@selector(lookForCrashLog) withObject:NULL]; } /* Listen to the remote in exclusive mode, only when VLC is the active @@ -1222,6 +1197,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)manage { playlist_t * p_playlist; + input_thread_t * p_input = NULL; /* new thread requires a new pool */ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; @@ -1230,46 +1206,64 @@ static VLCMain *_o_sharedMainInstance = nil; p_playlist = pl_Yield( p_intf ); + var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); var_AddCallback( p_playlist, "item-change", PlaylistChanged, self ); var_AddCallback( p_playlist, "item-append", PlaylistChanged, self ); var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self ); - var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); - while( (p_intf = VLCIntf) && !intf_ShouldDie( p_intf ) ) + vlc_object_lock( p_intf ); + while( vlc_object_alive( p_intf ) ) { vlc_mutex_lock( &p_intf->change_lock ); - - if( p_intf->p_sys->p_input == NULL ) + if( !p_input ) { - p_intf->p_sys->p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( p_playlist ); - /* Refresh the interface */ - if( p_intf->p_sys->p_input ) + /* Refresh the interface */ + if( p_input ) { msg_Dbg( p_intf, "input has changed, refreshing interface" ); - p_intf->p_sys->b_input_update = VLC_TRUE; + p_intf->p_sys->b_input_update = true; } } - else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead ) + else if( !vlc_object_alive (p_input) || p_input->b_dead ) { /* input stopped */ - p_intf->p_sys->b_intf_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = true; p_intf->p_sys->i_play_status = END_S; msg_Dbg( p_intf, "input has stopped, refreshing interface" ); - p_intf->p_sys->p_input = NULL; + vlc_object_release( p_input ); + p_input = NULL; } /* Manage volume status */ [self manageVolumeSlider]; vlc_mutex_unlock( &p_intf->change_lock ); - msleep( 100000 ); + + vlc_object_timedwait( p_intf, 100000 + mdate()); } + vlc_object_unlock( p_intf ); [o_pool release]; + + if( p_input ) vlc_object_release( p_input ); + + var_DelCallback( p_playlist, "playlist-current", PlaylistChanged, self ); + var_DelCallback( p_playlist, "intf-change", PlaylistChanged, self ); + var_DelCallback( p_playlist, "item-change", PlaylistChanged, self ); + var_DelCallback( p_playlist, "item-append", PlaylistChanged, self ); + var_DelCallback( p_playlist, "item-deleted", PlaylistChanged, self ); + + pthread_testcancel(); /* If we were cancelled stop here */ + + msg_Dbg( p_intf, "Killing the Mac OS X module" ); + + /* We are dead, terminate */ + [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO]; } - (void)manageIntf:(NSTimer *)o_timer @@ -1278,36 +1272,41 @@ static VLCMain *_o_sharedMainInstance = nil; playlist_t * p_playlist; input_thread_t * p_input; - if( p_intf->p_libvlc->b_die == VLC_TRUE ) - { - [o_timer invalidate]; - return; - } - if( p_intf->p_sys->b_input_update ) { /* Called when new input is opened */ - p_intf->p_sys->b_current_title_update = VLC_TRUE; - p_intf->p_sys->b_intf_update = VLC_TRUE; - p_intf->p_sys->b_input_update = VLC_FALSE; + p_intf->p_sys->b_current_title_update = true; + p_intf->p_sys->b_intf_update = true; + p_intf->p_sys->b_input_update = false; + [self setupMenus]; /* Make sure input menu is up to date */ } if( p_intf->p_sys->b_intf_update ) { - 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; + bool b_input = false; + bool b_plmul = false; + bool b_control = false; + bool b_seekable = false; + bool b_chapters = false; playlist_t * p_playlist = pl_Yield( p_intf ); /* TODO: fix i_size use */ b_plmul = p_playlist->items.i_size > 1; - p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( p_playlist ); + bool b_buffering = NO; + if( ( b_input = ( p_input != NULL ) ) ) { /* seekable streams */ - vlc_object_yield( p_input ); + int state = input_GetState( p_input ); + if ( state == INIT_S || + state == OPENING_S || + state == BUFFERING_S ) + { + b_buffering = YES; + } + + /* seekable streams */ b_seekable = var_GetBool( p_input, "seekable" ); /* check whether slow/fast motion is possible */ @@ -1317,7 +1316,19 @@ static VLCMain *_o_sharedMainInstance = nil; //b_chapters = p_input->stream.i_area_nb > 1; vlc_object_release( p_input ); } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); + + if( b_buffering ) + { + [o_main_pgbar startAnimation:self]; + [o_main_pgbar setIndeterminate:YES]; + [o_main_pgbar setHidden:NO]; + } + else + { + [o_main_pgbar stopAnimation:self]; + [o_main_pgbar setHidden:YES]; + } [o_btn_stop setEnabled: b_input]; [o_btn_ff setEnabled: b_seekable]; @@ -1333,60 +1344,54 @@ static VLCMain *_o_sharedMainInstance = nil; [o_embedded_window setSeekable: b_seekable]; - p_intf->p_sys->b_current_title_update = VLC_TRUE; + p_intf->p_sys->b_current_title_update = true; - p_intf->p_sys->b_intf_update = VLC_FALSE; + p_intf->p_sys->b_intf_update = false; } if( p_intf->p_sys->b_playmode_update ) { [o_playlist playModeUpdated]; - p_intf->p_sys->b_playmode_update = VLC_FALSE; + p_intf->p_sys->b_playmode_update = false; } if( p_intf->p_sys->b_playlist_update ) { [o_playlist playlistUpdated]; - p_intf->p_sys->b_playlist_update = VLC_FALSE; + p_intf->p_sys->b_playlist_update = false; } if( p_intf->p_sys->b_fullscreen_update ) { - p_intf->p_sys->b_fullscreen_update = VLC_FALSE; + p_intf->p_sys->b_fullscreen_update = false; } if( p_intf->p_sys->b_intf_show ) { [o_window makeKeyAndOrderFront: self]; - p_intf->p_sys->b_intf_show = VLC_FALSE; + p_intf->p_sys->b_intf_show = false; } - p_playlist = pl_Yield( p_intf ); - p_input = p_playlist->p_input; - - if( p_input && !p_input->b_die ) + p_input = pl_CurrentInput( p_intf ); + if( p_input && vlc_object_alive (p_input) ) { vlc_value_t val; - vlc_object_yield( p_input ); if( p_intf->p_sys->b_current_title_update ) { - NSString *o_temp; + NSString *aString; + input_item_t * p_item = input_GetItem( p_input ); + char * name = input_item_GetNowPlaying( p_item ); - if( p_playlist->status.p_item == NULL ) - { - vlc_object_release( p_input ); - vlc_object_release( p_playlist ); - return; - } - if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) ) - o_temp = [NSString stringWithUTF8String: - input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )]; - else - o_temp = [NSString stringWithUTF8String: - p_playlist->status.p_item->p_input->psz_name]; - [self setScrollField: o_temp stopAfter:-1]; - [[[self getControls] getFSPanel] setStreamTitle: o_temp]; + if( !name ) + name = input_item_GetName( p_item ); + + aString = [NSString stringWithUTF8String:name]; + + free(name); + + [self setScrollField: aString stopAfter:-1]; + [[[self getControls] getFSPanel] setStreamTitle: aString]; [[o_controls getVoutView] updateTitle]; @@ -1416,21 +1421,6 @@ static VLCMain *_o_sharedMainInstance = nil; [o_embedded_window setTime: o_time position: f_updated]; } - if( p_intf->p_sys->b_volume_update ) - { - NSString *o_text; - int i_volume_step = 0; - o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX]; - if( i_lastShownVolume != -1 ) - [self setScrollField:o_text stopAfter:1000000]; - i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); - [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step]; - [o_volumeslider setEnabled: TRUE]; - [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step]; - p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 ); - p_intf->p_sys->b_volume_update = FALSE; - } - /* Manage Playing status */ var_Get( p_input, "state", &val ); if( p_intf->p_sys->i_play_status != val.i_int ) @@ -1441,33 +1431,52 @@ static VLCMain *_o_sharedMainInstance = nil; } vlc_object_release( p_input ); } + else if( p_input ) + { + vlc_object_release( p_input ); + } else { p_intf->p_sys->i_play_status = END_S; - p_intf->p_sys->b_intf_update = VLC_TRUE; [self playStatusUpdated: p_intf->p_sys->i_play_status]; [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; [self setSubmenusEnabled: FALSE]; } - vlc_object_release( p_playlist ); + if( p_intf->p_sys->b_volume_update ) + { + NSString *o_text; + int i_volume_step = 0; + o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX]; + if( i_lastShownVolume != -1 ) + [self setScrollField:o_text stopAfter:1000000]; + i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); + [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step]; + [o_volumeslider setEnabled: TRUE]; + [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step]; + p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 ); + p_intf->p_sys->b_volume_update = FALSE; + } + +end: [self updateMessageArray]; if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input ) [self resetScrollField]; - [NSTimer scheduledTimerWithTimeInterval: 0.3 + [interfaceTimer autorelease]; + + interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.3 target: self selector: @selector(manageIntf:) - userInfo: nil repeats: FALSE]; + userInfo: nil repeats: FALSE] retain]; } - (void)setupMenus { playlist_t * p_playlist = pl_Yield( p_intf ); - input_thread_t * p_input = p_playlist->p_input; + input_thread_t * p_input = playlist_CurrentInput( p_playlist ); if( p_input != NULL ) { - vlc_object_yield( p_input ); [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input var: "program" selector: @selector(toggleVar:)]; @@ -1536,7 +1545,7 @@ static VLCMain *_o_sharedMainInstance = nil; } vlc_object_release( p_input ); } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification @@ -1578,13 +1587,12 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)resetScrollField { playlist_t * p_playlist = pl_Yield( p_intf ); - input_thread_t * p_input = p_playlist->p_input; + input_thread_t * p_input = playlist_CurrentInput( p_playlist ); i_end_scroll = -1; - if( p_input && !p_input->b_die ) + if( p_input && vlc_object_alive (p_input) ) { NSString *o_temp; - vlc_object_yield( p_input ); if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) ) o_temp = [NSString stringWithUTF8String: input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )]; @@ -1592,11 +1600,12 @@ static VLCMain *_o_sharedMainInstance = nil; o_temp = [NSString stringWithUTF8String: p_playlist->status.p_item->p_input->psz_name]; [self setScrollField: o_temp stopAfter:-1]; + [[[self getControls] getFSPanel] setStreamTitle: o_temp]; vlc_object_release( p_input ); - vlc_object_release( p_playlist ); + pl_Release( p_intf ); return; } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); [self setScrollField: _NS("VLC media player") stopAfter:-1]; } @@ -1736,14 +1745,13 @@ static VLCMain *_o_sharedMainInstance = nil; return; } p_playlist = pl_Yield( p_intf ); - p_input = p_playlist->p_input; + p_input = playlist_CurrentInput( p_playlist ); if( p_input != NULL ) { vlc_value_t time; vlc_value_t pos; NSString * o_time; char psz_time[MSTRTIME_MAX_SIZE]; - vlc_object_yield( p_input ); pos.f_float = f_updated / 10000.; var_Set( p_input, "position", pos ); @@ -1757,7 +1765,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_embedded_window setTime: o_time position: f_updated]; vlc_object_release( p_input ); } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (void)applicationWillTerminate:(NSNotification *)notification @@ -1766,10 +1774,21 @@ static VLCMain *_o_sharedMainInstance = nil; vout_thread_t * p_vout; int returnedValue = 0; - /* Stop playback */ - p_playlist = pl_Yield( p_intf ); - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + msg_Dbg( p_intf, "Terminating" ); + + /* Make sure the manage_thread won't call -terminate: again */ + pthread_cancel( manage_thread ); + + /* Make sure the intf object is getting killed */ + vlc_object_kill( p_intf ); + + /* Make sure our manage_thread ends */ + pthread_join( manage_thread, NULL ); + + /* Make sure the interfaceTimer is destroyed */ + [interfaceTimer invalidate]; + [interfaceTimer release]; + interfaceTimer = nil; /* make sure that the current volume is saved */ config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume ); @@ -1785,7 +1804,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_extended savePrefs]; } - p_intf->b_interaction = VLC_FALSE; + p_intf->b_interaction = false; var_DelCallback( p_intf, "interaction", InteractCallback, self ); /* remove global observer watching for vout device changes correctly */ @@ -1793,84 +1812,64 @@ static VLCMain *_o_sharedMainInstance = nil; /* release some other objects here, because it isn't sure whether dealloc * will be called later on */ - - if( nib_about_loaded && o_about ) + + if( nib_about_loaded ) [o_about release]; - - if( nib_prefs_loaded && o_prefs ) - [o_prefs release]; - - if( nib_open_loaded && o_open ) - [o_open release]; - - if( nib_extended_loaded && o_extended ) + + if( nib_prefs_loaded ) { - [o_extended collapsAll]; - [o_extended release]; + [o_sprefs release]; + [o_prefs release]; } - - if( nib_bookmarks_loaded && o_bookmarks ) - [o_bookmarks release]; - if( nib_info_loaded && o_info ) - [o_info release]; - - if( nib_wizard_loaded && o_wizard ) - [o_wizard release]; - - if( o_embedded_list != nil ) - [o_embedded_list release]; - - if( o_interaction_list != nil ) - [o_interaction_list release]; - - if( o_eyetv != nil ) - [o_eyetv release]; + if( nib_open_loaded ) + [o_open release]; - if( o_img_pause_pressed != nil ) + if( nib_extended_loaded ) { - [o_img_pause_pressed release]; - o_img_pause_pressed = nil; + [o_extended release]; } - if( o_img_play_pressed != nil ) - { - [o_img_pause_pressed release]; - o_img_pause_pressed = nil; - } + if( nib_bookmarks_loaded ) + [o_bookmarks release]; - if( o_img_pause != nil ) + if( o_info ) { - [o_img_pause release]; - o_img_pause = nil; + [o_info stopTimers]; + [o_info release]; } - if( o_img_play != nil ) - { - [o_img_play release]; - o_img_play = nil; - } + if( nib_wizard_loaded ) + [o_wizard release]; + + [o_embedded_list release]; + [o_interaction_list release]; + [o_eyetv release]; - if( o_msg_arr != nil ) - { - [o_msg_arr removeAllObjects]; - [o_msg_arr release]; - o_msg_arr = nil; - } + [o_img_pause_pressed release]; + [o_img_play_pressed release]; + [o_img_pause release]; + [o_img_play release]; - if( o_msg_lock != nil ) - { - [o_msg_lock release]; - o_msg_lock = nil; - } + [o_msg_arr removeAllObjects]; + [o_msg_arr release]; + + [o_msg_lock release]; /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; - vlc_object_kill( p_intf ); + /* Kill the playlist, so that it doesn't accept new request + * such as the play request from vlc.c (we are a blocking interface). */ + p_playlist = pl_Yield( p_intf ); + vlc_object_kill( p_playlist ); + pl_Release( p_intf ); + + vlc_object_kill( p_intf->p_libvlc ); /* Go back to Run() and make libvlc exit properly */ - longjmp( jmpbuffer, 1 ); + if( jmpbuffer ) + longjmp( jmpbuffer, 1 ); /* not reached */ } @@ -1934,6 +1933,18 @@ static VLCMain *_o_sharedMainInstance = nil; } } +- (IBAction)intfOpenCapture:(id)sender +{ + if( !nib_open_loaded ) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openCapture]; + } else { + [o_open openCapture]; + } +} + - (IBAction)showWizard:(id)sender { if( !nib_wizard_loaded ) @@ -1951,33 +1962,12 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)showExtended:(id)sender { if( o_extended == nil ) - { o_extended = [[VLCExtended alloc] init]; - } + if( !nib_extended_loaded ) - { nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self]; - [o_extended initStrings]; - [o_extended showPanel]; - } else { - [o_extended showPanel]; - } -} -- (IBAction)showSFilters:(id)sender -{ - if( o_sfilters == nil ) - { - o_sfilters = [[VLCsFilters alloc] init]; - } - if( !nib_sfilters_loaded ) - { - nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self]; - [o_sfilters initStrings]; - [o_sfilters showAsPanel]; - } else { - [o_sfilters showAsPanel]; - } + [o_extended showPanel]; } - (IBAction)showBookmarks:(id)sender @@ -2014,15 +2004,13 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)viewPreferences:(id)sender { if( !nib_prefs_loaded ) - nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; - - if( sender == o_mi_sprefs ) { + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; o_sprefs = [[VLCSimplePrefs alloc] init]; - [o_sprefs showSimplePrefs]; + o_prefs= [[VLCPrefs alloc] init]; } - else - [o_prefs showPrefs]; + + [o_sprefs showSimplePrefs]; } - (IBAction)checkForUpdate:(id)sender @@ -2033,7 +2021,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_update showUpdateWindow]; #else msg_Err( VLCIntf, "Update checker wasn't enabled in this build" ); - intf_UserFatal( VLCIntf, VLC_FALSE, _("Update check failed"), _("Checking for updates was not enabled in this build.") ); + intf_UserFatal( VLCIntf, false, _("Update check failed"), _("Checking for updates was not enabled in this build.") ); #endif } @@ -2086,24 +2074,134 @@ static VLCMain *_o_sharedMainInstance = nil; [[NSWorkspace sharedWorkspace] openURL: o_url]; } -- (IBAction)openCrashLog:(id)sender +#pragma mark Crash Log +- (void)mailCrashLog:(NSString *)crashLog withUserComment:(NSString *)userComment +{ + static char mail[] = + "From: vlcuser \n" + "To: VideoLAN Crash Report \n" + "Subject: %@\n" + "Content-Type: text/plain; charset=ISO-8859-1; format=flowed\n" + "Content-Transfer-Encoding: 7bit\n" + "\n" + "%@\n\n" + "User Comment:\n%@\n--------------\n" + "\n" + "Crash log:\n%@\n--------------\n" + "\n" + "\n"; + NSString * mailPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"vlc_crash_mail.eml"]; + NSString * mailContent = [NSString stringWithFormat:[NSString stringWithUTF8String:mail], + _NS("Crash Report (Type Command-shift-D and hit send)"), + _NS("Type Command-shift-D (or in Menu \"Message\">\"Send Again\") and hit the \"Send Mail\" button."), + userComment, crashLog]; + BOOL ret = [mailContent writeToFile:mailPath atomically:YES encoding:NSUTF8StringEncoding error:nil]; + if( !ret ) + { + NSRunAlertPanel(_NS("Error when generating crash report mail."), _NS("Can't prepare crash log mail"), _NS("OK"), nil, nil, nil ); + return; + } + + [[NSWorkspace sharedWorkspace] openFile:mailPath]; +} + + +- (NSString *)latestCrashLogPathPreviouslySeen:(BOOL)previouslySeen +{ + NSString * crashReporter = [@"~/Library/Logs/CrashReporter" stringByExpandingTildeInPath]; + NSDirectoryEnumerator *direnum = [[NSFileManager defaultManager] enumeratorAtPath:crashReporter]; + NSString *fname; + NSString * latestLog = nil; + NSInteger year = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0; + NSInteger month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0; + NSInteger day = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"] : 0; + NSInteger hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0; + + while (fname = [direnum nextObject]) + { + [direnum skipDescendents]; + if([fname hasPrefix:@"VLC"] && [fname hasSuffix:@"crash"]) + { + NSArray * compo = [fname componentsSeparatedByString:@"_"]; + if( [compo count] < 3 ) continue; + compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"]; + if( [compo count] < 4 ) continue; + + // Dooh. ugly. + if( year < [[compo objectAtIndex:0] intValue] || + (year ==[[compo objectAtIndex:0] intValue] && + (month < [[compo objectAtIndex:1] intValue] || + (month ==[[compo objectAtIndex:1] intValue] && + (day < [[compo objectAtIndex:2] intValue] || + (day ==[[compo objectAtIndex:2] intValue] && + hours < [[compo objectAtIndex:3] intValue] )))))) + { + year = [[compo objectAtIndex:0] intValue]; + month = [[compo objectAtIndex:1] intValue]; + day = [[compo objectAtIndex:2] intValue]; + hours = [[compo objectAtIndex:3] intValue]; + latestLog = [crashReporter stringByAppendingPathComponent:fname]; + } + } + } + + if(!(latestLog && [[NSFileManager defaultManager] fileExistsAtPath:latestLog])) + return nil; + + if( !previouslySeen ) + { + [[NSUserDefaults standardUserDefaults] setInteger:year forKey:@"LatestCrashReportYear"]; + [[NSUserDefaults standardUserDefaults] setInteger:month forKey:@"LatestCrashReportMonth"]; + [[NSUserDefaults standardUserDefaults] setInteger:day forKey:@"LatestCrashReportDay"]; + [[NSUserDefaults standardUserDefaults] setInteger:hours forKey:@"LatestCrashReportHours"]; + } + return latestLog; +} + +- (NSString *)latestCrashLogPath +{ + return [self latestCrashLogPathPreviouslySeen:YES]; +} + +- (void)lookForCrashLog { - NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log" - stringByExpandingTildeInPath]; + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; + // This pref key doesn't exists? this VLC is an upgrade, and this crash log come from previous version + BOOL areCrashLogsTooOld = ![[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"]; + NSString * latestLog = [self latestCrashLogPathPreviouslySeen:NO]; + if( latestLog && !areCrashLogsTooOld ) + [self performSelectorOnMainThread:@selector(notifyCrashLogToUser:) withObject:latestLog waitUntilDone:NO]; + + [pool release]; +} - if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) +- (void)notifyCrashLogToUser:(NSString *)crashLogPath +{ + int ret = NSRunInformationalAlertPanel(_NS("VLC has previously crashed"), + _NS("VLC has previously crashed, do you want to send an email with the crash to VLC's team?"), + _NS("Send"), _NS("Don't Send"), nil, nil); + if( ret == NSAlertDefaultReturn ) { - [[NSWorkspace sharedWorkspace] openFile: o_path - withApplication: @"Console"]; + [self mailCrashLog:[NSString stringWithContentsOfFile:crashLogPath] withUserComment:_NS("")]; + } +} + +- (IBAction)openCrashLog:(id)sender +{ + NSString * latestLog = [self latestCrashLogPath]; + if( latestLog ) + { + [[NSWorkspace sharedWorkspace] openFile: latestLog withApplication: @"Console"]; } else { NSBeginInformationalAlertSheet(_NS("No CrashLog found"), _NS("Continue"), nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") ); - } } +#pragma mark - + - (IBAction)viewErrorsAndWarnings:(id)sender { [[[self getInteractionList] getErrorPanel] showPanel]; @@ -2252,7 +2350,7 @@ static VLCMain *_o_sharedMainInstance = nil; { /* If large and coming from small then show */ [o_playlist_view setAutoresizesSubviews: YES]; - [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - [o_window minSize].height - 10 )]; + [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - [o_window minSize].height )]; [o_playlist_view setNeedsDisplay:YES]; [[o_window contentView] addSubview: o_playlist_view]; b_small_window = NO;