X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=a6469f7816165652e0c9bea1b13e5e4a62ad7dc4;hb=ef93d6eb1043e6d374e6c9cfdcf476645f0896d5;hp=4785786cdfa7095071ddbbe669ae8d3f218b7733;hpb=9ac6fec0593429dfb7a4cf25698b874ebc045be2;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 4785786cdf..a6469f7816 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,7 +1,7 @@ /***************************************************************************** * intf.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2008 the VideoLAN team + * Copyright (C) 2002-2009 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -30,12 +30,11 @@ #include /* malloc(), free() */ #include /* for MAXPATHLEN */ #include +#include #include +#include #include /* execl() */ - -#ifdef HAVE_CONFIG_H -# include "config.h" -#endif +#import #import "intf.h" #import "fspanel.h" @@ -49,7 +48,7 @@ #import "wizard.h" #import "extended.h" #import "bookmarks.h" -#import "interaction.h" +#import "coredialogs.h" #import "embeddedwindow.h" #import "update.h" #import "AppleRemote.h" @@ -57,9 +56,8 @@ #import "simple_prefs.h" #import "vlm.h" -#import -#import -#import +#import /* for crashlog send mechanism */ +#import /* for the media key support */ /***************************************************************************** * Local prototypes. @@ -83,19 +81,18 @@ int OpenIntf ( vlc_object_t *p_this ) p_intf->p_sys = malloc( sizeof( intf_sys_t ) ); if( p_intf->p_sys == NULL ) - { - return( 1 ); - } + return VLC_ENOMEM; memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) ); p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; - p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); + /* subscribe to LibVLCCore's messages */ + p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, MsgCallback, NULL ); p_intf->pf_run = Run; p_intf->b_should_run_on_first_thread = true; - return( 0 ); + return VLC_SUCCESS; } /***************************************************************************** @@ -105,8 +102,6 @@ void CloseIntf ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; - msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); - [p_intf->p_sys->o_pool release]; free( p_intf->p_sys ); @@ -138,7 +133,7 @@ static void Run( intf_thread_t *p_intf ) /* Install a jmpbuffer to where we can go back before the NSApp exit * see applicationWillTerminate: */ - [NSApplication sharedApplication]; + [VLCApplication sharedApplication]; [[VLCMain sharedInstance] setIntf: p_intf]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; @@ -147,13 +142,41 @@ static void Run( intf_thread_t *p_intf ) * see applicationWillTerminate: */ if(setjmp(jmpbuffer) == 0) [NSApp run]; - + [o_pool release]; } #pragma mark - #pragma mark Variables Callback +/***************************************************************************** + * MsgCallback: Callback triggered by the core once a new debug message is + * ready to be displayed. We store everything in a NSArray in our Cocoa part + * of this file, so we are forwarding everything through notifications. + *****************************************************************************/ +static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned int i ) +{ + int canc = vlc_savecancel(); + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + + /* this may happen from time to time, let's bail out as info would be useless anyway */ + if( !item->psz_module || !item->psz_msg ) + return; + + NSDictionary *o_dict = [NSDictionary dictionaryWithObjectsAndKeys: + [NSString stringWithUTF8String: item->psz_module], @"Module", + [NSString stringWithUTF8String: item->psz_msg], @"Message", + [NSNumber numberWithInt: item->i_type], @"Type", nil]; + + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreMessageReceived" + object: nil + userInfo: o_dict]; + + [o_pool release]; + vlc_restorecancel( canc ); +} + + /***************************************************************************** * playlistChanged: Callback triggered by the intf-change playlist * variable, to let the intf update the playlist. @@ -162,10 +185,13 @@ 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_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; + if( p_intf && p_intf->p_sys ) + { + 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; } @@ -178,7 +204,8 @@ 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 = true; + if( p_intf && p_intf->p_sys ) + p_intf->p_sys->b_intf_show = true; return VLC_SUCCESS; } @@ -190,25 +217,25 @@ 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 = true; + if( p_intf && p_intf->p_sys ) + p_intf->p_sys->b_fullscreen_update = true; return VLC_SUCCESS; } /***************************************************************************** - * InteractCallback: Callback triggered by the interaction - * variable, to let the intf display error and interaction dialogs + * DialogCallback: Callback triggered by the "dialog-*" variables + * to let the intf display error and interaction dialogs *****************************************************************************/ -static int InteractCallback( vlc_object_t *p_this, const char *psz_variable, - vlc_value_t old_val, vlc_value_t new_val, void *param ) +static int DialogCallback( vlc_object_t *p_this, const char *type, vlc_value_t previous, vlc_value_t value, void *data ) { NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; - VLCMain *interface = (VLCMain *)param; - interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address); + VLCMain *interface = (VLCMain *)data; + + const dialog_fatal_t *p_dialog = (const dialog_fatal_t *)value.p_address; + NSValue *o_value = [NSValue valueWithPointer:p_dialog]; - - [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList] - userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]]; - + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewCoreDialogEventNotification" object:[interface getCoreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_value, @"VLCDialogPointer", [NSString stringWithUTF8String: type], @"VLCDialogType", nil]]; + [o_pool release]; return VLC_SUCCESS; } @@ -245,6 +272,11 @@ static VLCMain *_o_sharedMainInstance = nil; else _o_sharedMainInstance = [super init]; + o_msg_lock = [[NSLock alloc] init]; + o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain]; + /* subscribe to LibVLC's debug messages as early as possible (for us) */ + [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(libvlcMessageReceived:) name: @"VLCCoreMessageReceived" object: nil]; + o_about = [[VLAboutBox alloc] init]; o_prefs = nil; o_open = [[VLCOpen alloc] init]; @@ -253,7 +285,7 @@ static VLCMain *_o_sharedMainInstance = nil; o_extended = nil; o_bookmarks = [[VLCBookmarks alloc] init]; o_embedded_list = [[VLCEmbeddedList alloc] init]; - o_interaction_list = [[VLCInteractionList alloc] init]; + o_coredialogs = [[VLCCoreDialogProvider alloc] init]; o_info = [[VLCInfo alloc] init]; #ifdef UPDATE_CHECK o_update = [[VLCUpdate alloc] init]; @@ -261,9 +293,11 @@ static VLCMain *_o_sharedMainInstance = nil; i_lastShownVolume = -1; +#ifndef __x86_64__ o_remote = [[AppleRemote alloc] init]; [o_remote setClickCountEnabledButtons: kRemoteButtonPlay]; [o_remote setDelegate: _o_sharedMainInstance]; +#endif o_eyetv = [[VLCEyeTVController alloc] init]; @@ -293,6 +327,30 @@ static VLCMain *_o_sharedMainInstance = nil; /* Check if we already did this once. Opening the other nibs calls it too, because VLCMain is the owner */ if( nib_main_loaded ) return; + /* check whether the user runs a valid version of OS X */ + if( MACOS_VERSION < 10.5f ) + { + NSAlert *ourAlert; + int i_returnValue; + NSString *o_blabla; + if( MACOS_VERSION == 10.4f ) + o_blabla = _NS("VLC's last release for your OS is the 0.9 series." ); + else if( MACOS_VERSION == 10.3f ) + o_blabla = _NS("VLC's last release for your OS is VLC 0.8.6i, which is prone to known security issues." ); + else // 10.2 and 10.1, still 3% of the OS X market share + o_blabla = _NS("VLC's last release for your OS is VLC 0.7.2, which is highly out of date and prone to " \ + "known security issues. We recommend you to update your Mac to a modern version of Mac OS X."); + ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is no longer supported") + defaultButton: _NS("Quit") + alternateButton: NULL + otherButton: NULL + informativeTextWithFormat: _NS("VLC media player %s requires Mac OS X 10.5 or higher.\n\n%@"), VLC_Version(), o_blabla]; + [ourAlert setAlertStyle: NSCriticalAlertStyle]; + i_returnValue = [ourAlert runModal]; + [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO]; + return; + } + [self initStrings]; [o_window setExcludedFromWindowsMenu: YES]; @@ -406,10 +464,20 @@ static VLCMain *_o_sharedMainInstance = nil; var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self); pl_Release( p_intf ); - - var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); - var_AddCallback( p_intf, "interaction", InteractCallback, self ); - p_intf->b_interaction = true; + + /* load our Core Dialogs nib */ + nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp]; + + /* subscribe to various interactive dialogues */ + var_Create( p_intf, "dialog-fatal", VLC_VAR_ADDRESS ); + var_AddCallback( p_intf, "dialog-fatal", DialogCallback, self ); + var_Create( p_intf, "dialog-login", VLC_VAR_ADDRESS ); + var_AddCallback( p_intf, "dialog-login", DialogCallback, self ); + var_Create( p_intf, "dialog-question", VLC_VAR_ADDRESS ); + var_AddCallback( p_intf, "dialog-question", DialogCallback, self ); + var_Create( p_intf, "dialog-progress-bar", VLC_VAR_ADDRESS ); + var_AddCallback( p_intf, "dialog-progress-bar", DialogCallback, self ); + dialog_Register( p_intf ); /* update the playmode stuff */ p_intf->p_sys->b_playmode_update = true; @@ -419,24 +487,21 @@ static VLCMain *_o_sharedMainInstance = nil; name: NSApplicationDidChangeScreenParametersNotification object: nil]; + /* take care of tint changes during runtime */ o_img_play = [NSImage imageNamed: @"play"]; o_img_pause = [NSImage imageNamed: @"pause"]; - [self controlTintChanged]; - [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector( controlTintChanged ) name: NSControlTintDidChangeNotification object: nil]; - + + /* yeah, we are done */ nib_main_loaded = TRUE; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification { - o_msg_lock = [[NSLock alloc] init]; - o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain]; - /* FIXME: don't poll */ interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5 target: self selector: @selector(manageIntf:) @@ -448,21 +513,6 @@ static VLCMain *_o_sharedMainInstance = nil; [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf var: "intf-add" selector: @selector(toggleVar:)]; - /* check whether the user runs a valid version of OSX; alert is auto-released */ - if( MACOS_VERSION < 10.4f ) - { - NSAlert *ourAlert; - int i_returnValue; - ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is not supported") - defaultButton: _NS("Quit") - alternateButton: NULL - otherButton: NULL - informativeTextWithFormat: _NS("VLC media player requires Mac OS X 10.4 or higher.")]; - [ourAlert setAlertStyle: NSCriticalAlertStyle]; - i_returnValue = [ourAlert runModal]; - [NSApp terminate: self]; - } - vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); } @@ -473,7 +523,7 @@ static VLCMain *_o_sharedMainInstance = nil; #ifdef UPDATE_CHECK /* Check for update silently on startup */ if( !nib_update_loaded ) - nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; + nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner: NSApp]; if([o_update shouldCheckForUpdate]) [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:nil]; @@ -505,7 +555,8 @@ static VLCMain *_o_sharedMainInstance = nil; /* messages panel */ [o_msgs_panel setTitle: _NS("Messages")]; - [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog...")]; + [o_msgs_crashlog_btn setTitle: _NS("Open CrashLog...")]; + [o_msgs_save_btn setTitle: _NS("Save this Log...")]; /* main menu */ [o_mi_about setTitle: [_NS("About VLC media player") \ @@ -521,8 +572,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_quit setTitle: _NS("Quit VLC")]; [o_mu_file setTitle: _ANS("1:File")]; - [o_mi_open_generic setTitle: _NS("Open File...")]; - [o_mi_open_file setTitle: _NS("Quick Open File...")]; + [o_mi_open_generic setTitle: _NS("Advanced Open File...")]; + [o_mi_open_file setTitle: _NS("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...")]; @@ -558,8 +609,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_chapter setTitle: _NS("Chapter")]; [o_mu_audio setTitle: _NS("Audio")]; - [o_mi_vol_up setTitle: _NS("Volume Up")]; - [o_mi_vol_down setTitle: _NS("Volume Down")]; + [o_mi_vol_up setTitle: _NS("Increase Volume")]; + [o_mi_vol_down setTitle: _NS("Decrease Volume")]; [o_mi_mute setTitle: _NS("Mute")]; [o_mi_audiotrack setTitle: _NS("Audio Track")]; [o_mu_audiotrack setTitle: _NS("Audio Track")]; @@ -588,6 +639,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_screen setTitle: _NS("Fullscreen Video Device")]; [o_mi_subtitle setTitle: _NS("Subtitles Track")]; [o_mu_subtitle setTitle: _NS("Subtitles Track")]; + [o_mi_addSub setTitle: _NS("Open File...")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")]; [o_mu_deinterlace setTitle: _NS("Deinterlace")]; [o_mi_ffmpeg_pp setTitle: _NS("Post processing")]; @@ -654,6 +706,19 @@ static VLCMain *_o_sharedMainInstance = nil; #pragma mark - #pragma mark Termination +- (void)releaseRepresentedObjects:(NSMenu *)the_menu +{ + NSArray *menuitems_array = [the_menu itemArray]; + for( int i=0; i<[menuitems_array count]; i++ ) + { + NSMenuItem *one_item = [menuitems_array objectAtIndex: i]; + if( [one_item hasSubmenu] ) + [self releaseRepresentedObjects: [one_item submenu]]; + + [one_item setRepresentedObject:NULL]; + } +} + - (void)applicationWillTerminate:(NSNotification *)notification { playlist_t * p_playlist; @@ -684,9 +749,13 @@ static VLCMain *_o_sharedMainInstance = nil; { [o_extended savePrefs]; } - - p_intf->b_interaction = false; - var_DelCallback( p_intf, "interaction", InteractCallback, self ); + + /* unsubscribe from the interactive dialogues */ + dialog_Unregister( p_intf ); + var_DelCallback( p_intf, "dialog-fatal", DialogCallback, self ); + var_DelCallback( p_intf, "dialog-login", DialogCallback, self ); + var_DelCallback( p_intf, "dialog-question", DialogCallback, self ); + var_DelCallback( p_intf, "dialog-progress-bar", DialogCallback, self ); /* remove global observer watching for vout device changes correctly */ [[NSNotificationCenter defaultCenter] removeObserver: self]; @@ -695,7 +764,6 @@ 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 release]; @@ -729,7 +797,7 @@ static VLCMain *_o_sharedMainInstance = nil; [crashLogURLConnection release]; [o_embedded_list release]; - [o_interaction_list release]; + [o_coredialogs release]; [o_eyetv release]; [o_img_pause_pressed release]; @@ -737,6 +805,9 @@ static VLCMain *_o_sharedMainInstance = nil; [o_img_pause release]; [o_img_play release]; + /* unsubscribe from libvlc's debug messages */ + msg_Unsubscribe( p_intf->p_sys->p_sub ); + [o_msg_arr removeAllObjects]; [o_msg_arr release]; @@ -745,13 +816,16 @@ static VLCMain *_o_sharedMainInstance = nil; /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; + /* Make sure the Menu doesn't have any references to vlc objects anymore */ + [self releaseRepresentedObjects:[NSApp mainMenu]]; + /* 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_Hold( p_intf ); vlc_object_kill( p_playlist ); pl_Release( p_intf ); - vlc_object_kill( p_intf->p_libvlc ); + libvlc_Quit( p_intf->p_libvlc ); [self setIntf:nil]; @@ -871,11 +945,15 @@ static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl"; application */ - (void)applicationDidBecomeActive:(NSNotification *)aNotification { +#ifndef __x86_64__ [o_remote startListening: self]; +#endif } - (void)applicationDidResignActive:(NSNotification *)aNotification { +#ifndef __x86_64__ [o_remote stopListening: self]; +#endif } /* Triggered when the computer goes to sleep */ @@ -1253,7 +1331,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; if( !nib_prefs_loaded ) - nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp]; return o_sprefs; } @@ -1264,7 +1342,7 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; if( !nib_prefs_loaded ) - nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp]; return o_prefs; } @@ -1277,6 +1355,11 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } +- (BOOL)isPlaylistCollapsed +{ + return ![o_btn_playlist state]; +} + - (id)getInfo { if( o_info ) @@ -1314,10 +1397,10 @@ static unsigned int VLCModifiersToCocoa( unsigned int i_key ) return nil; } -- (id)getInteractionList +- (id)getCoreDialogProvider { - if( o_interaction_list ) - return o_interaction_list; + if( o_coredialogs ) + return o_coredialogs; return nil; } @@ -1372,7 +1455,7 @@ struct manage_cleanup_stack { id self; }; -static void * manage_cleanup( void * args ) +static void manage_cleanup( void * args ) { struct manage_cleanup_stack * manage_cleanup_stack = args; intf_thread_t * p_intf = manage_cleanup_stack->p_intf; @@ -1380,16 +1463,15 @@ static void * manage_cleanup( void * args ) id self = manage_cleanup_stack->self; playlist_t * p_playlist = manage_cleanup_stack->p_playlist; - var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-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-item-append", PlaylistChanged, self ); + var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self ); pl_Release( p_intf ); if( p_input ) vlc_object_release( p_input ); - return NULL; } - (void)manage @@ -1403,11 +1485,11 @@ static void * manage_cleanup( void * args ) p_playlist = pl_Hold( p_intf ); - var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-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-item-append", PlaylistChanged, self ); + var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self ); struct manage_cleanup_stack stack = { p_intf, &p_input, p_playlist, self }; pthread_cleanup_push(manage_cleanup, &stack); @@ -1415,7 +1497,6 @@ static void * manage_cleanup( void * args ) while( true ) { NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init]; - vlc_mutex_lock( &p_intf->change_lock ); if( !p_input ) { @@ -1445,8 +1526,6 @@ static void * manage_cleanup( void * args ) /* Manage volume status */ [self manageVolumeSlider]; - vlc_mutex_unlock( &p_intf->change_lock ); - msleep( INTF_IDLE_SLEEP ); [pool release]; @@ -1495,7 +1574,8 @@ static void * manage_cleanup( void * args ) bool b_chapters = false; playlist_t * p_playlist = pl_Hold( p_intf ); - /* TODO: fix i_size use */ + + /* TODO: fix i_size use */ b_plmul = p_playlist->items.i_size > 1; p_input = playlist_CurrentInput( p_playlist ); @@ -1506,17 +1586,25 @@ static void * manage_cleanup( void * args ) /* seekable streams */ cachedInputState = input_GetState( p_input ); if ( cachedInputState == INIT_S || - cachedInputState == OPENING_S || - cachedInputState == BUFFERING_S ) + cachedInputState == OPENING_S ) { b_buffering = YES; } - + + /* update our info-panel to reflect the new item, if we don't show + * the playlist or the selection is empty */ + if( [self isPlaylistCollapsed] == YES ) + { + PL_LOCK; + [[self getInfo] updatePanelWithItem: playlist_CurrentPlayingItem( p_playlist )->p_input]; + PL_UNLOCK; + } + /* seekable streams */ - b_seekable = var_GetBool( p_input, "seekable" ); + b_seekable = var_GetBool( p_input, "can-seek" ); /* check whether slow/fast motion is possible */ - b_control = p_input->b_can_pace_control; + b_control = var_GetBool( p_input, "can-rate" ); /* chapters & titles */ //b_chapters = p_input->stream.i_area_nb > 1; @@ -1573,7 +1661,10 @@ static void * manage_cleanup( void * args ) if( p_intf->p_sys->b_intf_show ) { - [o_window makeKeyAndOrderFront: self]; + if( [[o_controls voutView] isFullscreen] && config_GetInt( VLCIntf, "macosx-fspanel" ) ) + [[o_controls getFSPanel] fadeIn]; + else + [o_window makeKeyAndOrderFront: self]; p_intf->p_sys->b_intf_show = false; } @@ -1620,7 +1711,13 @@ static void * manage_cleanup( void * args ) var_Get( p_input, "time", &time ); - o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; + mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) ); + if( b_time_remaining && dur != -1 ) + { + o_time = [NSString stringWithFormat: @"-%s", secstotimestr( psz_time, ((dur - time.i_time) / 1000000))]; + } + else + o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; [o_timefield setStringValue: o_time]; [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; @@ -1665,7 +1762,7 @@ static void * manage_cleanup( void * args ) } end: - [self updateMessageArray]; + [self updateMessageDisplay]; if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input ) [self resetScrollField]; @@ -1704,8 +1801,11 @@ end: [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input var: "spu-es" selector: @selector(toggleVar:)]; - aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, - FIND_ANYWHERE ); + /* special case for "Open File" inside the subtitles menu item */ + if( [o_mi_videotrack isEnabled] == YES ) + [o_mi_subtitle setEnabled: YES]; + + aout_instance_t * p_aout = input_GetAout( p_input ); if( p_aout != NULL ) { [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout @@ -1719,8 +1819,7 @@ end: vlc_object_release( (vlc_object_t *)p_aout ); } - vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); + vout_thread_t * p_vout = input_GetVout( p_input ); if( p_vout != NULL ) { @@ -1738,6 +1837,8 @@ end: [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout var: "deinterlace" selector: @selector(toggleVar:)]; +#if 0 +/* FIXME Post processing. */ p_dec_obj = (vlc_object_t *)vlc_object_find( (vlc_object_t *)p_vout, VLC_OBJECT_DECODER, @@ -1750,6 +1851,7 @@ end: vlc_object_release(p_dec_obj); } +#endif vlc_object_release( (vlc_object_t *)p_vout ); } vlc_object_release( p_input ); @@ -1802,11 +1904,13 @@ end: if( p_input && vlc_object_alive (p_input) ) { NSString *o_temp; + PL_LOCK; playlist_item_t * p_item = playlist_CurrentPlayingItem( p_playlist ); if( input_item_GetNowPlaying( p_item->p_input ) ) o_temp = [NSString stringWithUTF8String:input_item_GetNowPlaying( p_item->p_input )]; else o_temp = [NSString stringWithUTF8String:p_item->p_input->psz_name]; + PL_UNLOCK; [self setScrollField: o_temp stopAfter:-1]; [[[self getControls] getFSPanel] setStreamTitle: o_temp]; vlc_object_release( p_input ); @@ -1857,6 +1961,7 @@ end: [o_mi_screen setEnabled: b_enabled]; [o_mi_aspect_ratio setEnabled: b_enabled]; [o_mi_crop setEnabled: b_enabled]; + [o_mi_teletext setEnabled: b_enabled]; } - (IBAction)timesliderUpdate:(id)sender @@ -1891,7 +1996,14 @@ end: var_Get( p_input, "time", &time ); - o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; + mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) ); + if( b_time_remaining && dur != -1 ) + { + o_time = [NSString stringWithFormat: @"-%s", secstotimestr( psz_time, ((dur - time.i_time) / 1000000) )]; + } + else + o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; + [o_timefield setStringValue: o_time]; [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; @@ -1900,6 +2012,12 @@ end: pl_Release( p_intf ); } +- (IBAction)timeFieldWasClicked:(id)sender +{ + b_time_remaining = !b_time_remaining; +} + + #pragma mark - #pragma mark Recent Items @@ -1921,7 +2039,7 @@ end: { if( !nib_open_loaded ) { - nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; [o_open awakeFromNib]; [o_open openFile]; } else { @@ -1933,7 +2051,7 @@ end: { if( !nib_open_loaded ) { - nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; [o_open awakeFromNib]; [o_open openFileGeneric]; } else { @@ -1945,7 +2063,7 @@ end: { if( !nib_open_loaded ) { - nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; [o_open awakeFromNib]; [o_open openDisc]; } else { @@ -1957,7 +2075,7 @@ end: { if( !nib_open_loaded ) { - nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; [o_open awakeFromNib]; [o_open openNet]; } else { @@ -1969,7 +2087,7 @@ end: { if( !nib_open_loaded ) { - nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp]; [o_open awakeFromNib]; [o_open openCapture]; } else { @@ -1981,7 +2099,7 @@ end: { if( !nib_wizard_loaded ) { - nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self]; + nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner: NSApp]; [o_wizard initStrings]; [o_wizard resetWizard]; [o_wizard showWizard]; @@ -1994,7 +2112,7 @@ end: - (IBAction)showVLM:(id)sender { if( !nib_vlm_loaded ) - nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner:self]; + nib_vlm_loaded = [NSBundle loadNibNamed:@"VLM" owner: NSApp]; [o_vlm showVLMWindow]; } @@ -2005,7 +2123,7 @@ end: o_extended = [[VLCExtended alloc] init]; if( !nib_extended_loaded ) - nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self]; + nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner: NSApp]; [o_extended showPanel]; } @@ -2015,12 +2133,12 @@ end: /* we need the wizard-nib for the bookmarks's extract functionality */ if( !nib_wizard_loaded ) { - nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self]; + nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner: NSApp]; [o_wizard initStrings]; } if( !nib_bookmarks_loaded ) - nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self]; + nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner: NSApp]; [o_bookmarks showBookmarks]; } @@ -2029,7 +2147,7 @@ end: { if( !nib_prefs_loaded ) { - nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp]; o_sprefs = [[VLCSimplePrefs alloc] init]; o_prefs= [[VLCPrefs alloc] init]; } @@ -2044,11 +2162,11 @@ end: { #ifdef UPDATE_CHECK if( !nib_update_loaded ) - nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; + nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner: NSApp]; [o_update showUpdateWindow]; #else msg_Err( VLCIntf, "Update checker wasn't enabled in this build" ); - intf_UserFatal( VLCIntf, false, _("Update check failed"), _("Checking for updates was not enabled in this build.") ); + dialog_FatalWait( VLCIntf, _("Update check failed"), _("Checking for updates was not enabled in this build.") ); #endif } @@ -2058,7 +2176,7 @@ end: - (IBAction)viewAbout:(id)sender { if( !nib_about_loaded ) - nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; + nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp]; [o_about showAbout]; } @@ -2066,7 +2184,7 @@ end: - (IBAction)showLicense:(id)sender { if( !nib_about_loaded ) - nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; + nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp]; [o_about showGPL: sender]; } @@ -2075,7 +2193,7 @@ end: { if( !nib_about_loaded ) { - nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; + nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp]; [o_about showHelp]; } else @@ -2240,7 +2358,7 @@ end: - (IBAction)crashReporterAction:(id)sender { if( sender == o_crashrep_send_btn ) - [self sendCrashLog:[NSString stringWithContentsOfFile: [self latestCrashLogPath]] withUserComment: [o_crashrep_fld string]]; + [self sendCrashLog:[NSString stringWithContentsOfFile: [self latestCrashLogPath] encoding: NSUTF8StringEncoding error: NULL] withUserComment: [o_crashrep_fld string]]; [NSApp stopModal]; [o_crashrep_win orderOut: sender]; @@ -2319,7 +2437,7 @@ end: - (IBAction)viewErrorsAndWarnings:(id)sender { - [[[self getInteractionList] getErrorPanel] showPanel]; + [[[self getCoreDialogProvider] getErrorPanel] showPanel]; } - (IBAction)showMessagesPanel:(id)sender @@ -2330,7 +2448,7 @@ end: - (IBAction)showInformationPanel:(id)sender { if(! nib_info_loaded ) - nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self]; + nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp]; [o_info initPanel]; } @@ -2338,6 +2456,12 @@ end: - (void)windowDidBecomeKey:(NSNotification *)o_notification { if( [o_notification object] == o_msgs_panel ) + [self updateMessageDisplay]; +} + +- (void)updateMessageDisplay +{ + if( [o_msgs_panel isVisible] && b_msg_arr_changed ) { id o_msg; NSEnumerator * o_enum; @@ -2353,70 +2477,78 @@ end: [o_messages insertText: o_msg]; } + b_msg_arr_changed = NO; [o_msg_lock unlock]; } } -- (void)updateMessageArray +- (void)libvlcMessageReceived: (NSNotification *)o_notification { - int i_start, i_stop; + NSColor *o_white = [NSColor whiteColor]; + NSColor *o_red = [NSColor redColor]; + NSColor *o_yellow = [NSColor yellowColor]; + NSColor *o_gray = [NSColor grayColor]; - vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); - i_stop = *p_intf->p_sys->p_sub->pi_stop; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); + NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray }; + static const char * ppsz_type[4] = { ": ", " error: ", + " warning: ", " debug: " }; - if( p_intf->p_sys->p_sub->i_start != i_stop ) - { - NSColor *o_white = [NSColor whiteColor]; - NSColor *o_red = [NSColor redColor]; - NSColor *o_yellow = [NSColor yellowColor]; - NSColor *o_gray = [NSColor grayColor]; + NSString *o_msg; + NSDictionary *o_attr; + NSAttributedString *o_msg_color; - NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray }; - static const char * ppsz_type[4] = { ": ", " error: ", - " warning: ", " debug: " }; + int i_type = [[[o_notification userInfo] objectForKey: @"Type"] intValue]; - for( i_start = p_intf->p_sys->p_sub->i_start; - i_start != i_stop; - i_start = (i_start+1) % VLC_MSG_QSIZE ) - { - NSString *o_msg; - NSDictionary *o_attr; - NSAttributedString *o_msg_color; + [o_msg_lock lock]; - int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type; + if( [o_msg_arr count] + 2 > 400 ) + { + NSUInteger rid[] = { 0, 1 }; + /* FIXME: THIS METHOD WILL BE DEPRECATED */ + [o_msg_arr removeObjectsFromIndices: (NSUInteger *)&rid + numIndices: sizeof(rid)/sizeof(rid[0])]; + } - [o_msg_lock lock]; + o_attr = [NSDictionary dictionaryWithObject: o_gray + forKey: NSForegroundColorAttributeName]; + o_msg = [NSString stringWithFormat: @"%@%s", + [[o_notification userInfo] objectForKey: @"Module"], + ppsz_type[i_type]]; + o_msg_color = [[NSAttributedString alloc] + initWithString: o_msg attributes: o_attr]; + [o_msg_arr addObject: [o_msg_color autorelease]]; - if( [o_msg_arr count] + 2 > 400 ) - { - unsigned rid[] = { 0, 1 }; - [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid - numIndices: sizeof(rid)/sizeof(rid[0])]; - } + o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] + forKey: NSForegroundColorAttributeName]; + o_msg = [[[o_notification userInfo] objectForKey: @"Message"] stringByAppendingString: @"\n"]; + o_msg_color = [[NSAttributedString alloc] + initWithString: o_msg attributes: o_attr]; + [o_msg_arr addObject: [o_msg_color autorelease]]; - o_attr = [NSDictionary dictionaryWithObject: o_gray - forKey: NSForegroundColorAttributeName]; - o_msg = [NSString stringWithFormat: @"%s%s", - p_intf->p_sys->p_sub->p_msg[i_start].psz_module, - ppsz_type[i_type]]; - o_msg_color = [[NSAttributedString alloc] - initWithString: o_msg attributes: o_attr]; - [o_msg_arr addObject: [o_msg_color autorelease]]; - - o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] - forKey: NSForegroundColorAttributeName]; - o_msg = [[NSString stringWithUTF8String: p_intf->p_sys->p_sub->p_msg[i_start].psz_msg] stringByAppendingString: @"\n"]; - o_msg_color = [[NSAttributedString alloc] - initWithString: o_msg attributes: o_attr]; - [o_msg_arr addObject: [o_msg_color autorelease]]; - - [o_msg_lock unlock]; - } + b_msg_arr_changed = YES; + [o_msg_lock unlock]; +} + +- (IBAction)saveDebugLog:(id)sender +{ + NSOpenPanel * saveFolderPanel = [[NSSavePanel alloc] init]; + + [saveFolderPanel setCanChooseDirectories: NO]; + [saveFolderPanel setCanChooseFiles: YES]; + [saveFolderPanel setCanSelectHiddenExtension: NO]; + [saveFolderPanel setCanCreateDirectories: YES]; + [saveFolderPanel setRequiredFileType: @"rtfd"]; + [saveFolderPanel beginSheetForDirectory:nil file: [NSString stringWithFormat: _NS("VLC Debug Log (%s).rtfd"), VLC_Version()] modalForWindow: o_msgs_panel modalDelegate:self didEndSelector:@selector(saveDebugLogAsRTF:returnCode:contextInfo:) contextInfo:nil]; +} - vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); - p_intf->p_sys->p_sub->i_start = i_start; - vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock ); +- (void)saveDebugLogAsRTF: (NSSavePanel *)sheet returnCode: (int)returnCode contextInfo: (void *)contextInfo +{ + BOOL b_returned; + if( returnCode == NSOKButton ) + { + b_returned = [o_messages writeRTFDToFile: [sheet filename] atomically: YES]; + if(! b_returned ) + msg_Warn( p_intf, "Error while saving the debug log" ); } } @@ -2497,13 +2629,11 @@ end: - (void)updateTogglePlaylistState { if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. ) - { [o_btn_playlist setState: NO]; - } else - { [o_btn_playlist setState: YES]; - } + + [[self getPlaylist] outlineViewSelectionDidChange: NULL]; } - (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize @@ -2644,3 +2774,66 @@ end: } @end + +/***************************************************************************** + * VLCApplication interface + * exclusively used to implement media key support on Al Apple keyboards + * b_justJumped is required as the keyboard send its events faster than + * the user can actually jump through his media + *****************************************************************************/ + +@implementation VLCApplication + +- (void)sendEvent: (NSEvent*)event +{ + if( [event type] == NSSystemDefined && [event subtype] == 8 ) + { + int keyCode = (([event data1] & 0xFFFF0000) >> 16); + int keyFlags = ([event data1] & 0x0000FFFF); + int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA; + int keyRepeat = (keyFlags & 0x1); + + if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 ) + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE ); + + if( keyCode == NX_KEYTYPE_FAST && !b_justJumped ) + { + if( keyState == 0 && keyRepeat == 0 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_NEXT ); + } + else if( keyRepeat == 1 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT ); + b_justJumped = YES; + [self performSelector:@selector(resetJump) + withObject: NULL + afterDelay:0.25]; + } + } + + if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped ) + { + if( keyState == 0 && keyRepeat == 0 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV ); + } + else if( keyRepeat == 1 ) + { + var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT ); + b_justJumped = YES; + [self performSelector:@selector(resetJump) + withObject: NULL + afterDelay:0.25]; + } + } + } + [super sendEvent: event]; +} + +- (void)resetJump +{ + b_justJumped = NO; +} + +@end