X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=8de21a070a4e7c295b5414d538f79b205ae6cd75;hb=59da25707ad2c660c0327d6edb59824729922710;hp=639cf2786f7d5d1c114a5056612fe46126ce1e64;hpb=560016e367f498eccd4559a6c939895ef9ffbe26;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 639cf2786f..8de21a070a 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -449,6 +449,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]; @@ -481,7 +482,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 ); @@ -791,6 +792,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 @@ -1132,6 +1135,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]; @@ -1153,25 +1157,25 @@ 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 = playlist_CurrentInput( p_playlist ); + 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( !vlc_object_alive (p_intf->p_sys->p_input) || 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" ); - vlc_object_release( p_intf->p_sys->p_input ); - p_intf->p_sys->p_input = NULL; + vlc_object_release( p_input ); + p_input = NULL; } /* Manage volume status */ @@ -1184,6 +1188,8 @@ static VLCMain *_o_sharedMainInstance = nil; 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 ); @@ -1210,6 +1216,7 @@ static VLCMain *_o_sharedMainInstance = nil; 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 ) { @@ -1238,7 +1245,7 @@ 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 ); [o_btn_stop setEnabled: b_input]; [o_btn_ff setEnabled: b_seekable]; @@ -1282,32 +1289,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 ); - + 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 ); - pl_Release( p_intf ); - goto end; - } - 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]; @@ -1337,21 +1338,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 ) @@ -1362,15 +1348,32 @@ 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]; } - pl_Release( p_intf ); + + 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]; @@ -1388,10 +1391,9 @@ end: - (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:)]; @@ -1460,7 +1462,7 @@ end: } vlc_object_release( p_input ); } - vlc_object_release( p_playlist ); + pl_Release( p_intf ); } - (void)refreshVoutDeviceMenu:(NSNotification *)o_notification @@ -1502,13 +1504,12 @@ end: - (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 && 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 )]; @@ -1518,10 +1519,10 @@ end: [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]; } @@ -1661,14 +1662,13 @@ end: 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 ); @@ -1682,7 +1682,7 @@ end: [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 @@ -1750,9 +1750,12 @@ end: 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]; @@ -1773,6 +1776,12 @@ end: /* 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 */ @@ -1918,12 +1927,7 @@ end: o_prefs= [[VLCPrefs alloc] init]; } - if( sender == o_mi_sprefs ) - { - [o_sprefs showSimplePrefs]; - } - else - [o_prefs showPrefs]; + [o_sprefs showSimplePrefs]; } - (IBAction)checkForUpdate:(id)sender @@ -1987,24 +1991,128 @@ end: [[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 \n" + "Subject: Crash Report (Type Ctrl-shift-D and hit send)\n" + "Content-Type: text/plain; charset=ISO-8859-1; format=flowed\n" + "Content-Transfer-Encoding: 7bit\n" + "\n" + "(Type Ctrl-shift-D and hit send)\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], 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]; + + // 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:@""]; + } +} - if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) +- (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];