X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=2c30f12786a1e589c6a9f6ea7cf4cc09f78b0418;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=aa529071f5f1ab0785d6094a4fbccbca3b063e8f;hpb=1a112b8a40daf2a86ad1aa310b8eb4fe1255bdce;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index aa529071f5..2c30f12786 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -387,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" ); @@ -449,11 +450,16 @@ 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]; b_restore_size = false; - if( [o_window frame].size.height <= 200 ) + + // Set that here as IB seems to be buggy + [o_window setContentMinSize:NSMakeSize(338., 30.)]; + + if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. ) { b_small_window = YES; [o_window setFrame: NSMakeRect( [o_window frame].origin.x, @@ -464,14 +470,16 @@ static VLCMain *_o_sharedMainInstance = nil; else { b_small_window = NO; - [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - 95 )]; + NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]]; + [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )]; [o_playlist_view setNeedsDisplay:YES]; [o_playlist_view setAutoresizesSubviews: YES]; [[o_window contentView] addSubview: o_playlist_view]; } + [self updateTogglePlaylistState]; - o_size_with_playlist = [o_window frame].size; + o_size_with_playlist = [o_window contentRectForFrameRect:[o_window frame]].size; p_playlist = pl_Yield( p_intf ); @@ -508,6 +516,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; @@ -552,7 +621,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 */ @@ -791,6 +860,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 @@ -1213,6 +1284,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 ) { @@ -1226,11 +1298,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" ); @@ -1243,6 +1324,18 @@ static VLCMain *_o_sharedMainInstance = nil; } 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]; [o_btn_rewind setEnabled: b_seekable]; @@ -1285,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 ); - + 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]; @@ -1340,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 ) @@ -1365,6 +1437,10 @@ 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; @@ -1372,7 +1448,21 @@ static VLCMain *_o_sharedMainInstance = nil; [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]; @@ -1749,9 +1839,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]; @@ -1987,24 +2080,134 @@ 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 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 { - 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 *)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 ) + { + [self mailCrashLog:[NSString stringWithContentsOfFile:crashLogPath] withUserComment:_NS("")]; + } +} - 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]; @@ -2045,35 +2248,35 @@ end: } } +#pragma mark Playlist toggling + - (IBAction)togglePlaylist:(id)sender { - NSRect o_rect = [o_window frame]; + NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]]; + NSRect o_rect = [o_window contentRectForFrameRect:[o_window frame]]; /*First, check if the playlist is visible*/ - if( o_rect.size.height <= 200 ) + if( contentRect.size.height <= 169. ) { - o_restore_rect = o_rect; + o_restore_rect = contentRect; b_restore_size = true; b_small_window = YES; /* we know we are small, make sure this is actually set (see case below) */ + /* make large */ - if( o_size_with_playlist.height > 200 ) - { + if( o_size_with_playlist.height > 169. ) o_rect.size.height = o_size_with_playlist.height; - } else { - o_rect.size.height = 500; - } + else + o_rect.size.height = 500.; - if( o_size_with_playlist.width > [o_window minSize].width ) - { + if( o_size_with_playlist.width >= [o_window contentMinSize].width ) o_rect.size.width = o_size_with_playlist.width; - } else { - o_rect.size.width = 500; - } - - o_rect.size.height = (o_size_with_playlist.height > 200) ? - o_size_with_playlist.height : 500; - o_rect.origin.x = [o_window frame].origin.x; - o_rect.origin.y = [o_window frame].origin.y - o_rect.size.height + - [o_window minSize].height; + else + o_rect.size.width = [o_window contentMinSize].width; + + o_rect.origin.x = contentRect.origin.x; + o_rect.origin.y = contentRect.origin.y - o_rect.size.height + + [o_window contentMinSize].height; + + o_rect = [o_window frameRectForContentRect:o_rect]; NSRect screenRect = [[o_window screen] visibleFrame]; if( !NSContainsRect( screenRect, o_rect ) ) { @@ -2088,21 +2291,31 @@ end: else { NSSize curSize = o_rect.size; - /* make small */ - o_rect.size.height = [o_window minSize].height; - o_rect.size.width = [o_window minSize].width; - o_rect.origin.x = [o_window frame].origin.x; - /* Calculate the position of the lower right corner after resize */ - o_rect.origin.y = [o_window frame].origin.y + - [o_window frame].size.height - [o_window minSize].height; - if( b_restore_size ) + { o_rect = o_restore_rect; + if( o_rect.size.height < [o_window contentMinSize].height ) + o_rect.size.height = [o_window contentMinSize].height; + if( o_rect.size.width < [o_window contentMinSize].width ) + o_rect.size.width = [o_window contentMinSize].width; + } + else + { + NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]]; + /* make small */ + o_rect.size.height = [o_window contentMinSize].height; + o_rect.size.width = [o_window contentMinSize].width; + o_rect.origin.x = contentRect.origin.x; + /* Calculate the position of the lower right corner after resize */ + o_rect.origin.y = contentRect.origin.y + + contentRect.size.height - [o_window contentMinSize].height; + } [o_playlist_view setAutoresizesSubviews: NO]; [o_playlist_view removeFromSuperview]; [o_btn_playlist setState: NO]; b_small_window = NO; /* we aren't small here just yet. we are doing an animated resize after this */ + o_rect = [o_window frameRectForContentRect:o_rect]; } [o_window setFrame: o_rect display:YES animate: YES]; @@ -2110,7 +2323,7 @@ end: - (void)updateTogglePlaylistState { - if( [o_window frame].size.height <= 200 ) + if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. ) { [o_btn_playlist setState: NO]; } @@ -2122,13 +2335,16 @@ end: - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize { + /* Not triggered on a window resize or maxification of the window. only by window mouse dragging resize */ /*Stores the size the controller one resize, to be able to restore it when toggling the playlist*/ o_size_with_playlist = proposedFrameSize; - if( proposedFrameSize.height <= 200 ) + NSRect rect; + rect.size = proposedFrameSize; + if( [o_window contentRectForFrameRect:rect].size.height <= 169. ) { if( b_small_window == NO ) { @@ -2153,7 +2369,8 @@ end: { /* If large and coming from small then show */ [o_playlist_view setAutoresizesSubviews: YES]; - [o_playlist_view setFrame: NSMakeRect( 0, 0, [o_window frame].size.width, [o_window frame].size.height - [o_window minSize].height )]; + NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]]; + [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )]; [o_playlist_view setNeedsDisplay:YES]; [[o_window contentView] addSubview: o_playlist_view]; b_small_window = NO; @@ -2161,6 +2378,8 @@ end: [self updateTogglePlaylistState]; } +#pragma mark - + @end @implementation VLCMain (NSMenuValidation)