X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=a1b38da6dad28dfc9f1dc0248072c34edfb5e249;hb=676a627a1ff186119ec05f690e34645a3e003431;hp=3addd181c3f57a7de64378fc5be0099ed3a6351a;hpb=19d9683044017341da6a5335aea1007cf05bf230;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 3addd181c3..a1b38da6da 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" @@ -106,7 +105,6 @@ int 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 ); p_intf->pf_run = Run; p_intf->b_should_run_on_first_thread = true; @@ -125,34 +123,11 @@ void 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" ); - - /* We are dead, terminate */ - [NSApp terminate: nil]; - [o_pool release]; - return NULL; -} - /***************************************************************************** * Run: main loop *****************************************************************************/ @@ -186,82 +161,24 @@ 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) [NSApp run]; - pthread_join( killer_thread, NULL ); - [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; + id self = user_data; - //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + [self manage]; - 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]; - - 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 ); + return NULL; } /***************************************************************************** @@ -431,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 @@ -471,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" ); @@ -533,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]; @@ -548,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]; @@ -565,7 +483,7 @@ static VLCMain *_o_sharedMainInstance = nil; var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, 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 ); @@ -592,6 +510,72 @@ static VLCMain *_o_sharedMainInstance = nil; nib_main_loaded = TRUE; } +#pragma mark Toolbar delegate +/* Our item identifiers */ +static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; + +- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar +{ + NSLog(@"toolbarAllowedItemIdentifiers %s", __func__); + + return [NSArray arrayWithObjects: +// NSToolbarCustomizeToolbarItemIdentifier, +// NSToolbarFlexibleSpaceItemIdentifier, +// NSToolbarSpaceItemIdentifier, +// NSToolbarSeparatorItemIdentifier, + VLCToolbarMediaControl, + nil ]; +} + +- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar +{ + NSLog(@"toolbarAllowedItemIdentifiers %s", __func__); + + return [NSArray arrayWithObjects: + VLCToolbarMediaControl, + nil ]; +} + +- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag +{ + NSLog(@"toolbarAllowedItemIdentifiers %s", __func__); + 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; @@ -636,7 +620,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 */ @@ -788,19 +772,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]; - /* FIXME: don't poll */ - [NSTimer scheduledTimerWithTimeInterval: 0.5 + interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5 target: self selector: @selector(manageIntf:) - userInfo: nil repeats: FALSE]; + userInfo: nil repeats: FALSE] retain]; - /* FIXME: don't poll */ - [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 +859,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 +1202,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]; @@ -1243,36 +1224,51 @@ static VLCMain *_o_sharedMainInstance = nil; { 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 ) + if( p_input ) { msg_Dbg( p_intf, "input has changed, refreshing interface" ); 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 = 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 ); - vlc_object_unlock( p_intf ); - msleep( 100000 ); - vlc_object_lock( p_intf ); + + 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 @@ -1281,21 +1277,13 @@ static VLCMain *_o_sharedMainInstance = nil; playlist_t * p_playlist; input_thread_t * p_input; - vlc_object_lock( p_intf ); - - if( !vlc_object_alive( p_intf ) ) - { - vlc_object_unlock( p_intf ); - [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 = 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 ) { @@ -1309,11 +1297,20 @@ static VLCMain *_o_sharedMainInstance = nil; /* TODO: fix i_size use */ b_plmul = p_playlist->items.i_size > 1; - p_input = vlc_object_find( p_playlist, VLC_OBJECT_INPUT, - FIND_CHILD ); - + p_input = playlist_CurrentInput( p_playlist ); + bool b_buffering = NO; + if( ( b_input = ( p_input != NULL ) ) ) { + /* seekable streams */ + 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" ); @@ -1324,7 +1321,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]; @@ -1332,6 +1341,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_btn_prev setEnabled: (b_plmul || b_chapters)]; [o_btn_next setEnabled: (b_plmul || b_chapters)]; + NSLog(@"seekable %d", b_seekable); [o_timeslider setFloatValue: 0.0]; [o_timeslider setEnabled: b_seekable]; [o_timefield setStringValue: @"00:00"]; @@ -1368,32 +1378,26 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf->p_sys->b_intf_show = false; } - p_playlist = pl_Yield( p_intf ); - p_input = vlc_object_find( p_playlist, VLC_OBJECT_INPUT, - FIND_CHILD ); - - 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; 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]; @@ -1423,21 +1427,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 ) @@ -1448,34 +1437,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_playlist_update = 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]; - vlc_object_unlock( p_intf ); + 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:)]; @@ -1544,7 +1551,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 @@ -1586,13 +1593,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 )]; @@ -1602,10 +1608,10 @@ static VLCMain *_o_sharedMainInstance = nil; [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]; } @@ -1745,14 +1751,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 ); @@ -1766,7 +1771,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 @@ -1777,6 +1782,20 @@ static VLCMain *_o_sharedMainInstance = nil; 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 ); returnedValue = config_SaveConfigFile( p_intf->p_libvlc, "main" ); @@ -1820,9 +1839,12 @@ static VLCMain *_o_sharedMainInstance = nil; if( nib_bookmarks_loaded ) [o_bookmarks release]; - if( nib_info_loaded ) + if( o_info ) + { + [o_info stopTimers]; [o_info release]; - + } + if( nib_wizard_loaded ) [o_wizard release]; @@ -1843,6 +1865,12 @@ static VLCMain *_o_sharedMainInstance = nil; /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; + /* 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 */ @@ -1948,22 +1976,6 @@ static VLCMain *_o_sharedMainInstance = nil; [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]; - } -} - - (IBAction)showBookmarks:(id)sender { /* we need the wizard-nib for the bookmarks's extract functionality */ @@ -2004,12 +2016,7 @@ static VLCMain *_o_sharedMainInstance = nil; o_prefs= [[VLCPrefs alloc] init]; } - if( sender == o_mi_sprefs ) - { - [o_sprefs showSimplePrefs]; - } - else - [o_prefs showPrefs]; + [o_sprefs showSimplePrefs]; } - (IBAction)checkForUpdate:(id)sender @@ -2073,24 +2080,131 @@ 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 Ctrl-shift-D and hit send)"), + _NS("(Type Command-shift-D (Menu 'Message'>'Send Again' and hit send)"), + 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; + BOOL found = NO; + 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 ) { found = NO; break; } + compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"]; + if( [compo count] < 4 ) { found = NO; break; } + if( year < [[compo objectAtIndex:0] intValue] && + month < [[compo objectAtIndex:1] 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]; + found = YES; + } + } + } + + if(!(found && [[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 { - NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log" - stringByExpandingTildeInPath]; + return [self latestCrashLogPathPreviouslySeen:YES]; +} +- (void)lookForCrashLog +{ + NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) + // 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]; +} + +- (void)notifyCrashLogToUser:(NSString *)crashLog +{ + 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 ) + { + [self mailCrashLog:crashLog withUserComment:_NS("")]; + } +} + +- (IBAction)openCrashLog:(id)sender +{ + NSString * latestLog = [self latestCrashLogPath]; + if( latestLog ) { - [[NSWorkspace sharedWorkspace] openFile: o_path - withApplication: @"Console"]; + [[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]; @@ -2239,7 +2353,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;