X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=1e17a48b36ecabf0277da6bb779525cb325cf8d0;hb=48c2ac8c879a83c4f8737b978ca9c3232bb2e70d;hp=3a114fa6863e8fb5301f12aebdaf09e949ddfec1;hpb=997c5859d2ab8e7bc613d1c8654335a92c41b0f8;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 3a114fa686..1e17a48b36 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,19 +1,19 @@ /***************************************************************************** * intf.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2006 the VideoLAN team + * Copyright (C) 2002-2007 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman - * Felix KŸhne + * Felix Paul Kühne * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -48,12 +48,40 @@ #import "embeddedwindow.h" #import "update.h" #import "AppleRemote.h" +#import "eyetv.h" + +#import /***************************************************************************** * Local prototypes. *****************************************************************************/ static void Run ( intf_thread_t *p_intf ); +/* Quick hack */ +/***************************************************************************** + * VLCApplication implementation (this hack is really disgusting now, + * feel free to fix.) + *****************************************************************************/ +@interface VLCApplication : NSApplication +{ + libvlc_int_t *o_libvlc; +} +- (void)setVLC: (libvlc_int_t *)p_libvlc; +@end + + +@implementation VLCApplication +- (void)setVLC: (libvlc_int_t *) p_libvlc +{ + o_libvlc = p_libvlc; +} +- (void)terminate: (id)sender +{ + vlc_object_kill( o_libvlc ); + [super terminate: sender]; +} +@end + /***************************************************************************** * OpenIntf: initialize interface *****************************************************************************/ @@ -71,16 +99,11 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; - /* Put Cocoa into multithread mode as soon as possible. - * http://developer.apple.com/techpubs/macosx/Cocoa/ - * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html - * This thread does absolutely nothing at all. */ - [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil]; - p_intf->p_sys->o_sendport = [[NSPort port] retain]; p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); p_intf->b_play = VLC_TRUE; p_intf->pf_run = Run; + p_intf->b_should_run_on_first_thread = VLC_TRUE; return( 0 ); } @@ -103,16 +126,42 @@ void E_(CloseIntf) ( vlc_object_t *p_this ) /***************************************************************************** * Run: main loop *****************************************************************************/ +jmp_buf jmpbuffer; + static void Run( intf_thread_t *p_intf ) { + sigset_t set; + /* Do it again - for some unknown reason, vlc_thread_create() often * fails to go to real-time priority with the first launched thread * (???) --Meuuh */ vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); + + /* Make sure the "force quit" menu item does quit instantly. + * VLC overrides SIGTERM which is sent by the "force quit" + * menu item to make sure deamon mode quits gracefully, so + * we un-override SIGTERM here. */ + sigemptyset( &set ); + sigaddset( &set, SIGTERM ); + pthread_sigmask( SIG_UNBLOCK, &set, NULL ); + + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + + /* Install a jmpbuffer to where we can go back before the NSApp exit + * see applicationWillTerminate: */ + /* We need that code to run on main thread */ + [VLCApplication sharedApplication]; + [NSApp setVLC: p_intf->p_libvlc]; + [[VLCMain sharedInstance] setIntf: p_intf]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; - [NSApp run]; - [[VLCMain sharedInstance] terminate]; + + /* Install a jmpbuffer to where we can go back before the NSApp exit + * see applicationWillTerminate: */ + if(setjmp(jmpbuffer) == 0) + [NSApp run]; + + [o_pool release]; } int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) @@ -190,6 +239,7 @@ static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, p_intf->p_sys->b_playlist_update = VLC_TRUE; p_intf->p_sys->b_intf_update = VLC_TRUE; p_intf->p_sys->b_playmode_update = VLC_TRUE; + p_intf->p_sys->b_current_title_update = VLC_TRUE; return VLC_SUCCESS; } @@ -229,10 +279,10 @@ static int InteractCallback( vlc_object_t *p_this, const char *psz_variable, VLCMain *interface = (VLCMain *)param; interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address); NSValue *o_value = [NSValue valueWithPointer:p_dialog]; - + [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList] userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]]; - + [o_pool release]; return VLC_SUCCESS; } @@ -343,13 +393,24 @@ static VLCMain *_o_sharedMainInstance = nil; o_embedded_list = [[VLCEmbeddedList alloc] init]; o_interaction_list = [[VLCInteractionList alloc] init]; o_sfilters = nil; - o_update = [[VLCUpdate alloc] init]; +#ifdef UPDATE_CHECK + //FIXME o_update = [[VLCUpdate alloc] init]; +#endif i_lastShownVolume = -1; o_remote = [[AppleRemote alloc] init]; + [o_remote setClickCountEnabledButtons: kRemoteButtonPlay]; [o_remote setDelegate: _o_sharedMainInstance]; - + + o_eyetv = [[VLCEyeTVController alloc] init]; + + /* announce our launch to a potential eyetv plugin */ + [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit" + object: @"VLCEyeTVSupport" + userInfo: NULL + deliverImmediately: YES]; + return _o_sharedMainInstance; } @@ -435,7 +496,8 @@ static VLCMain *_o_sharedMainInstance = nil; [self setSubmenusEnabled: FALSE]; [self manageVolumeSlider]; [o_window setDelegate: self]; - + + b_restore_size = false; if( [o_window frame].size.height <= 200 ) { b_small_window = YES; @@ -456,33 +518,33 @@ static VLCMain *_o_sharedMainInstance = nil; o_size_with_playlist = [o_window frame].size; - p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE ); + p_playlist = pl_Yield( p_intf ); - if( p_playlist ) + /* Check if we need to start playing */ + if( p_intf->b_play ) { - /* Check if we need to start playing */ - if( p_intf->b_play ) - { - playlist_LockControl( p_playlist, PLAYLIST_AUTOPLAY ); - } - var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); - val.b_bool = VLC_FALSE; + playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE ); + } + var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); + val.b_bool = VLC_FALSE; - var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self); - var_AddCallback( p_playlist, "intf-show", ShowController, self); + var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self); + var_AddCallback( p_playlist, "intf-show", ShowController, self); - [o_embedded_window setFullscreen: var_GetBool( p_playlist, - "fullscreen" )]; - vlc_object_release( p_playlist ); - } - + vlc_object_release( p_playlist ); + var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); var_AddCallback( p_intf, "interaction", InteractCallback, self ); p_intf->b_interaction = VLC_TRUE; - // First we setup the blue selection box - another window that will be attached as a child window - // to this one, and will be moved by timers as needed. + /* update the playmode stuff */ + p_intf->p_sys->b_playmode_update = VLC_TRUE; + [[NSNotificationCenter defaultCenter] addObserver: self + selector: @selector(refreshVoutDeviceMenu:) + name: NSApplicationDidChangeScreenParametersNotification + object: nil]; + nib_main_loaded = TRUE; } @@ -505,7 +567,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* messages panel */ [o_msgs_panel setTitle: _NS("Messages")]; - [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")]; + [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog...")]; /* main menu */ [o_mi_about setTitle: [_NS("About VLC media player") \ @@ -595,25 +657,25 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_window setTitle: _NS("Window")]; [o_mi_minimize setTitle: _NS("Minimize Window")]; [o_mi_close_window setTitle: _NS("Close Window")]; - [o_mi_controller setTitle: _NS("Controller")]; - [o_mi_equalizer setTitle: _NS("Equalizer")]; - [o_mi_extended setTitle: _NS("Extended Controls")]; - [o_mi_bookmarks setTitle: _NS("Bookmarks")]; - [o_mi_playlist setTitle: _NS("Playlist")]; - [o_mi_info setTitle: _NS("Information")]; - [o_mi_messages setTitle: _NS("Messages")]; - [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings")]; + [o_mi_controller setTitle: _NS("Controller...")]; + [o_mi_equalizer setTitle: _NS("Equalizer...")]; + [o_mi_extended setTitle: _NS("Extended Controls...")]; + [o_mi_bookmarks setTitle: _NS("Bookmarks...")]; + [o_mi_playlist setTitle: _NS("Playlist...")]; + [o_mi_info setTitle: _NS("Media Information...")]; + [o_mi_messages setTitle: _NS("Messages...")]; + [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings...")]; [o_mi_bring_atf setTitle: _NS("Bring All to Front")]; [o_mu_help setTitle: _NS("Help")]; - [o_mi_readme setTitle: _NS("ReadMe...")]; - [o_mi_documentation setTitle: _NS("Online Documentation")]; - [o_mi_reportabug setTitle: _NS("Report a Bug")]; - [o_mi_website setTitle: _NS("VideoLAN Website")]; + [o_mi_help setTitle: _NS("VLC media player Help...")]; + [o_mi_readme setTitle: _NS("ReadMe / FAQ...")]; [o_mi_license setTitle: _NS("License")]; - [o_mi_donation setTitle: _NS("Make a donation")]; - [o_mi_forum setTitle: _NS("Online Forum")]; + [o_mi_documentation setTitle: _NS("Online Documentation...")]; + [o_mi_website setTitle: _NS("VideoLAN Website...")]; + [o_mi_donation setTitle: _NS("Make a donation...")]; + [o_mi_forum setTitle: _NS("Online Forum...")]; /* dock menu */ [o_dmi_play setTitle: _NS("Play")]; @@ -621,7 +683,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_dmi_next setTitle: _NS("Next")]; [o_dmi_previous setTitle: _NS("Previous")]; [o_dmi_mute setTitle: _NS("Mute")]; - + /* vout menu */ [o_vmi_play setTitle: _NS("Play")]; [o_vmi_stop setTitle: _NS("Stop")]; @@ -633,7 +695,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_vmi_fullscreen setTitle: _NS("Fullscreen")]; [o_vmi_snapshot setTitle: _NS("Snapshot")]; - [o_info_window setTitle: _NS("Information")]; + [o_info_window setTitle: _NS("Media Information")]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification @@ -661,19 +723,37 @@ 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 ); } - (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename { + BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" ); NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil]; - [o_playlist appendArray: - [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO]; + if( b_autoplay ) + [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO]; + else + [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: YES]; return( TRUE ); } -- (NSString *)localizedString:(char *)psz +- (NSString *)localizedString:(const char *)psz { NSString * o_str = nil; @@ -696,6 +776,32 @@ static VLCMain *_o_sharedMainInstance = nil; return( o_str ); } +/* When user click in the Dock icon our double click in the finder */ +- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows +{ + if (!hasVisibleWindows) + [o_window makeKeyAndOrderFront:self]; + + return YES; +} + +- (void)applicationDidFinishLaunching:(NSNotification *)aNotification +{ +#ifdef UPDATE_CHECK + /* Check for update silently on startup */ + if ( !nib_update_loaded ) + nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; + + // FIXME + //if([o_update shouldCheckForUpdate]) + // [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL]; +#endif + + /* Handle sleep notification */ + [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:) + name:NSWorkspaceWillSleepNotification object:nil]; +} + /* Listen to the remote in exclusive mode, only when VLC is the active application */ - (void)applicationDidBecomeActive:(NSNotification *)aNotification @@ -707,51 +813,68 @@ static VLCMain *_o_sharedMainInstance = nil; [o_remote stopListening: self]; } -/* Helper method for the remote control interface in order to trigger forward/backward as long - as the user holds the left/right button */ -- (void) triggerMovieStepForRemoteButton: (NSNumber*) buttonIdentifierNumber +/* Triggered when the computer goes to sleep */ +- (void)computerWillSleep: (NSNotification *)notification { - if (b_left_right_remote_button_hold) { - switch([buttonIdentifierNumber intValue]) { - case kRemoteButtonRight_Hold: - [o_controls forward: self]; + /* Pause */ + if ( p_intf->p_sys->i_play_status == PLAYING_S ) + { + vlc_value_t val; + val.i_int = config_GetInt( p_intf, "key-play-pause" ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); + } +} + +/* Helper method for the remote control interface in order to trigger forward/backward and volume + increase/decrease as long as the user holds the left/right, plus/minus button */ +- (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber +{ + if (b_remote_button_hold) + { + switch([buttonIdentifierNumber intValue]) + { + case kRemoteButtonRight_Hold: + [o_controls forward: self]; break; case kRemoteButtonLeft_Hold: - [o_controls backward: self]; - break; + [o_controls backward: self]; + break; + case kRemoteButtonVolume_Plus_Hold: + [o_controls volumeUp: self]; + break; + case kRemoteButtonVolume_Minus_Hold: + [o_controls volumeDown: self]; + break; } - if (b_left_right_remote_button_hold) { + if (b_remote_button_hold) + { /* trigger event */ - [self performSelector:@selector(triggerMovieStepForRemoteButton:) - withObject:buttonIdentifierNumber - afterDelay:0.25]; + [self performSelector:@selector(executeHoldActionForRemoteButton:) + withObject:buttonIdentifierNumber + afterDelay:0.25]; } } } /* Apple Remote callback */ -- (void)appleRemoteButton:(AppleRemoteEventIdentifier)buttonIdentifier - pressedDown:(BOOL)pressedDown +- (void) appleRemoteButton: (AppleRemoteEventIdentifier)buttonIdentifier + pressedDown: (BOOL) pressedDown + clickCount: (unsigned int) count { switch( buttonIdentifier ) { case kRemoteButtonPlay: - [o_controls play: self]; + if (count >= 2) { + [o_controls toogleFullscreen:self]; + } else { + [o_controls play: self]; + } break; case kRemoteButtonVolume_Plus: - /* there are two events when the plus or minus button is pressed - one when the button is pressed down and one when the button is released */ - if (pressedDown) - { - [o_controls volumeUp: self]; - } + [o_controls volumeUp: self]; break; case kRemoteButtonVolume_Minus: - /* there are two events when the plus or minus button is pressed - one when the button is pressed down and one when the button is released */ - if (pressedDown) { - [o_controls volumeDown: self]; - } + [o_controls volumeDown: self]; break; case kRemoteButtonRight: [o_controls next: self]; @@ -761,16 +884,19 @@ static VLCMain *_o_sharedMainInstance = nil; break; case kRemoteButtonRight_Hold: case kRemoteButtonLeft_Hold: + case kRemoteButtonVolume_Plus_Hold: + case kRemoteButtonVolume_Minus_Hold: /* simulate an event as long as the user holds the button */ - b_left_right_remote_button_hold = pressedDown; - if (pressedDown) { - NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier]; - [self performSelector:@selector(triggerMovieStepForRemoteButton:) + b_remote_button_hold = pressedDown; + if( pressedDown ) + { + NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier]; + [self performSelector:@selector(executeHoldActionForRemoteButton:) withObject:buttonIdentifierNumber]; } break; case kRemoteButtonMenu: - [o_controls windowAction: self]; + [o_controls showPosition: self]; break; default: /* Add here whatever you want other buttons to do */ @@ -917,10 +1043,8 @@ static VLCMain *_o_sharedMainInstance = nil; - (id)getPlaylist { - if ( o_playlist ) - { + if( o_playlist ) return o_playlist; - } return nil; } @@ -990,6 +1114,13 @@ static VLCMain *_o_sharedMainInstance = nil; return o_vout_menu; } +- (id)getEyeTVController +{ + if( o_eyetv ) + return o_eyetv; + return nil; +} + - (void)manage { playlist_t * p_playlist; @@ -999,21 +1130,17 @@ static VLCMain *_o_sharedMainInstance = nil; vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW ); - p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + p_playlist = pl_Yield( p_intf ); - if( p_playlist != NULL ) - { - var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); - var_AddCallback( p_playlist, "item-change", PlaylistChanged, self ); - var_AddCallback( p_playlist, "item-append", PlaylistChanged, self ); - var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self ); - var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); + var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-change", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-append", PlaylistChanged, self ); + var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self ); + var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self ); - vlc_object_release( p_playlist ); - } + vlc_object_release( p_playlist ); - while( !p_intf->b_die ) + while( !intf_ShouldDie( p_intf ) ) { vlc_mutex_lock( &p_intf->change_lock ); @@ -1034,7 +1161,6 @@ static VLCMain *_o_sharedMainInstance = nil; /* input stopped */ p_intf->p_sys->b_intf_update = VLC_TRUE; p_intf->p_sys->i_play_status = END_S; - [self setScrollField: _NS("VLC media player") stopAfter:-1]; msg_Dbg( p_intf, "input has stopped, refreshing interface" ); p_intf->p_sys->p_input = NULL; } @@ -1051,6 +1177,8 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)manageIntf:(NSTimer *)o_timer { vlc_value_t val; + playlist_t * p_playlist; + input_thread_t * p_input; if( p_intf->p_libvlc->b_die == VLC_TRUE ) { @@ -1073,25 +1201,26 @@ static VLCMain *_o_sharedMainInstance = nil; vlc_bool_t b_seekable = VLC_FALSE; vlc_bool_t b_chapters = VLC_FALSE; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - b_plmul = p_playlist->i_size > 1; + playlist_t * p_playlist = pl_Yield( p_intf ); + /** \todo fix i_size use */ + b_plmul = p_playlist->items.i_size > 1; + p_input = p_playlist->p_input; - vlc_object_release( p_playlist ); - - if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) ) + if( ( b_input = ( p_input != NULL ) ) ) { - vlc_object_yield( p_intf->p_sys->p_input ); /* seekable streams */ - b_seekable = var_GetBool( p_intf->p_sys->p_input, "seekable" ); + vlc_object_yield( p_input ); + b_seekable = var_GetBool( p_input, "seekable" ); /* check wether slow/fast motion is possible*/ - b_control = p_intf->p_sys->p_input->input.b_can_pace_control; + b_control = p_input->b_can_pace_control; + /* chapters & titles */ - //b_chapters = p_intf->p_sys->p_input->stream.i_area_nb > 1; - vlc_object_release( p_intf->p_sys->p_input ); + //b_chapters = p_input->stream.i_area_nb > 1; + vlc_object_release( p_input ); } + vlc_object_release( p_playlist ); [o_btn_stop setEnabled: b_input]; [o_btn_ff setEnabled: b_seekable]; @@ -1101,8 +1230,9 @@ static VLCMain *_o_sharedMainInstance = nil; [o_timeslider setFloatValue: 0.0]; [o_timeslider setEnabled: b_seekable]; - [o_timefield setStringValue: @"0:00:00"]; - [[[self getControls] getFSPanel] setStreamPos: 0 setSeconds: 0]; + [o_timefield setStringValue: @"00:00"]; + [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"00:00"]; + [[[self getControls] getFSPanel] setSeekable: b_seekable]; [o_embedded_window setSeekable: b_seekable]; @@ -1122,12 +1252,6 @@ static VLCMain *_o_sharedMainInstance = nil; if( p_intf->p_sys->b_fullscreen_update ) { - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - var_Get( p_playlist, "fullscreen", &val ); - [o_embedded_window setFullscreen: val.b_bool]; - vlc_object_release( p_playlist ); - p_intf->p_sys->b_fullscreen_update = VLC_FALSE; } @@ -1138,19 +1262,22 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf->p_sys->b_intf_show = VLC_FALSE; } - if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die ) + p_playlist = pl_Yield( p_intf ); + p_input = p_playlist->p_input; + + if( p_input && !p_input->b_die ) { vlc_value_t val; + vlc_object_yield( p_input ); if( p_intf->p_sys->b_current_title_update ) { NSString *o_temp; - vout_thread_t *p_vout; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL || p_playlist->status.p_item == NULL ) + if( p_playlist->status.p_item == NULL ) { + vlc_object_release( p_input ); + vlc_object_release( p_playlist ); return; } o_temp = [NSString stringWithUTF8String: @@ -1161,52 +1288,31 @@ static VLCMain *_o_sharedMainInstance = nil; [self setScrollField: o_temp stopAfter:-1]; [[[self getControls] getFSPanel] setStreamTitle: o_temp]; - p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT, - FIND_PARENT ); - if( p_vout != NULL ) - { - id o_vout_wnd; - NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator]; - - while( ( o_vout_wnd = [o_enum nextObject] ) ) - { - if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] - || [[[VLCMain sharedInstance] getEmbeddedList] - windowContainsEmbedded: o_vout_wnd] ) - { - msg_Dbg( p_intf, "updateTitle call getVoutView" ); - [[o_vout_wnd getVoutView] updateTitle]; - } - } - vlc_object_release( (vlc_object_t *)p_vout ); - } + [[o_controls getVoutView] updateTitle]; + [o_playlist updateRowSelection]; - vlc_object_release( p_playlist ); p_intf->p_sys->b_current_title_update = FALSE; } - if( p_intf->p_sys->p_input && [o_timeslider isEnabled] ) + if( [o_timeslider isEnabled] ) { /* Update the slider */ vlc_value_t time; NSString * o_time; - mtime_t i_seconds; vlc_value_t pos; + char psz_time[MSTRTIME_MAX_SIZE]; float f_updated; - var_Get( p_intf->p_sys->p_input, "position", &pos ); + var_Get( p_input, "position", &pos ); f_updated = 10000. * pos.f_float; [o_timeslider setFloatValue: f_updated]; - var_Get( p_intf->p_sys->p_input, "time", &time ); - i_seconds = time.i_time / 1000000; + var_Get( p_input, "time", &time ); + + o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; - o_time = [NSString stringWithFormat: @"%d:%02d:%02d", - (int) (i_seconds / (60 * 60)), - (int) (i_seconds / 60 % 60), - (int) (i_seconds % 60)]; [o_timefield setStringValue: o_time]; - [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds]; + [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; } @@ -1220,18 +1326,20 @@ static VLCMain *_o_sharedMainInstance = nil; 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_intf->p_sys->p_input, "state", &val ); + var_Get( p_input, "state", &val ); if( p_intf->p_sys->i_play_status != val.i_int ) { p_intf->p_sys->i_play_status = val.i_int; [self playStatusUpdated: p_intf->p_sys->i_play_status]; [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; } + vlc_object_release( p_input ); } else { @@ -1241,14 +1349,13 @@ static VLCMain *_o_sharedMainInstance = nil; [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; [self setSubmenusEnabled: FALSE]; } - + vlc_object_release( p_playlist ); [self updateMessageArray]; - if( (i_end_scroll != -1) && (mdate() > i_end_scroll) ) + if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input ) [self resetScrollField]; - [NSTimer scheduledTimerWithTimeInterval: 0.3 target: self selector: @selector(manageIntf:) userInfo: nil repeats: FALSE]; @@ -1256,9 +1363,11 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)setupMenus { -#define p_input p_intf->p_sys->p_input + playlist_t * p_playlist = pl_Yield( p_intf ); + input_thread_t * p_input = p_playlist->p_input; 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:)]; @@ -1325,8 +1434,36 @@ static VLCMain *_o_sharedMainInstance = nil; } vlc_object_release( (vlc_object_t *)p_vout ); } + vlc_object_release( p_input ); } -#undef p_input + vlc_object_release( p_playlist ); +} + +- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification +{ + int x,y = 0; + vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, + FIND_ANYWHERE ); + + if(! p_vout ) + return; + + /* clean the menu before adding new entries */ + if( [o_mi_screen hasSubmenu] ) + { + y = [[o_mi_screen submenu] numberOfItems] - 1; + msg_Dbg( VLCIntf, "%i items in submenu", y ); + while( x != y ) + { + msg_Dbg( VLCIntf, "removing item %i of %i", x, y ); + [[o_mi_screen submenu] removeItemAtIndex: x]; + x++; + } + } + + [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout + var: "video-device" selector: @selector(toggleVar:)]; + vlc_object_release( (vlc_object_t *)p_vout ); } - (void)setScrollField:(NSString *)o_string stopAfter:(int)timeout @@ -1340,25 +1477,25 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)resetScrollField { + playlist_t * p_playlist = pl_Yield( p_intf ); + input_thread_t * p_input = p_playlist->p_input; + i_end_scroll = -1; - if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die ) + if( p_input && !p_input->b_die ) { NSString *o_temp; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); - if( p_playlist == NULL ) - { - return; - } + vlc_object_yield( p_input ); o_temp = [NSString stringWithUTF8String: p_playlist->status.p_item->p_input->psz_name]; if( o_temp == NULL ) o_temp = [NSString stringWithCString: p_playlist->status.p_item->p_input->psz_name]; [self setScrollField: o_temp stopAfter:-1]; + vlc_object_release( p_input ); vlc_object_release( p_playlist ); return; } + vlc_object_release( p_playlist ); [self setScrollField: _NS("VLC media player") stopAfter:-1]; } @@ -1482,8 +1619,9 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)timesliderUpdate:(id)sender { -#define p_input p_intf->p_sys->p_input float f_updated; + playlist_t * p_playlist; + input_thread_t * p_input; switch( [[NSApp currentEvent] type] ) { @@ -1496,101 +1634,93 @@ static VLCMain *_o_sharedMainInstance = nil; default: return; } - + p_playlist = pl_Yield( p_intf ); + p_input = p_playlist->p_input; if( p_input != NULL ) { vlc_value_t time; vlc_value_t pos; - mtime_t i_seconds; 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 ); [o_timeslider setFloatValue: f_updated]; var_Get( p_input, "time", &time ); - i_seconds = time.i_time / 1000000; - o_time = [NSString stringWithFormat: @"%d:%02d:%02d", - (int) (i_seconds / (60 * 60)), - (int) (i_seconds / 60 % 60), - (int) (i_seconds % 60)]; + o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )]; [o_timefield setStringValue: o_time]; - [[[self getControls] getFSPanel] setStreamPos: pos.f_float setSeconds: i_seconds]; + [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; + vlc_object_release( p_input ); } -#undef p_input + vlc_object_release( p_playlist ); } -- (void)terminate +- (void)applicationWillTerminate:(NSNotification *)notification { playlist_t * p_playlist; vout_thread_t * p_vout; - -#define p_input p_intf->p_sys->p_input - if( p_input ) - { - vlc_object_release( p_input ); - p_input = NULL; - } -#undef p_input - + int returnedValue = 0; + /* Stop playback */ - if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ) ) ) - { - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); - } - - /* FIXME - Wait here until all vouts are terminated because - libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't - good on OS X. We definitly need a cleaner way to handle this, - but this may hopefully be good enough for now. - -- titer 2003/11/22 */ - while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ) ) ) - { - vlc_object_release( p_vout ); - msleep( 100000 ); - } - msleep( 500000 ); + p_playlist = pl_Yield( p_intf ); + playlist_Stop( p_playlist ); + vlc_object_release( p_playlist ); + + /* 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" ); + if( returnedValue != 0 ) + msg_Err( p_intf, + "error while saving volume in osx's terminate method (%i)", + returnedValue ); /* save the prefs if they were changed in the extended panel */ if (o_extended && [o_extended getConfigChanged]) { [o_extended savePrefs]; } - + p_intf->b_interaction = VLC_FALSE; var_DelCallback( p_intf, "interaction", InteractCallback, self ); + /* remove global observer watching for vout device changes correctly */ + [[NSNotificationCenter defaultCenter] removeObserver: self + name: NSApplicationDidChangeScreenParametersNotification + object: nil]; + /* release some other objects here, because it isn't sure whether dealloc * will be called later on -- FK (10/6/05) */ if( nib_about_loaded && o_about ) [o_about release]; - + if( nib_open_loaded && o_open ) [o_open release]; - + if( nib_extended_loaded && o_extended ) { [o_extended collapsAll]; [o_extended release]; } - + if( nib_bookmarks_loaded && o_bookmarks ) [o_bookmarks release]; if( nib_wizard_loaded && o_wizard ) [o_wizard release]; - + if( o_embedded_list != nil ) [o_embedded_list release]; if( o_interaction_list != nil ) [o_interaction_list release]; + if( o_eyetv != nil ) + [o_eyetv release]; + if( o_img_pause_pressed != nil ) { [o_img_pause_pressed release]; @@ -1631,9 +1761,14 @@ static VLCMain *_o_sharedMainInstance = nil; /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; - p_intf->b_die = VLC_TRUE; + vlc_object_kill( p_intf ); + + /* Go back to Run() and make libvlc exit properly */ + longjmp( jmpbuffer, 1 ); + /* not reached */ } + - (IBAction)clearRecentItems:(id)sender { [[NSDocumentController sharedDocumentController] @@ -1647,7 +1782,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)intfOpenFile:(id)sender { - if (!nib_open_loaded) + if ( !nib_open_loaded ) { nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; [o_open awakeFromNib]; @@ -1659,7 +1794,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)intfOpenFileGeneric:(id)sender { - if (!nib_open_loaded) + if ( !nib_open_loaded ) { nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; [o_open awakeFromNib]; @@ -1671,7 +1806,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)intfOpenDisc:(id)sender { - if (!nib_open_loaded) + if ( !nib_open_loaded ) { nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; [o_open awakeFromNib]; @@ -1683,7 +1818,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)intfOpenNet:(id)sender { - if (!nib_open_loaded) + if ( !nib_open_loaded ) { nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; [o_open awakeFromNib]; @@ -1695,7 +1830,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)showWizard:(id)sender { - if (!nib_wizard_loaded) + if ( !nib_wizard_loaded ) { nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self]; [o_wizard initStrings]; @@ -1713,7 +1848,7 @@ static VLCMain *_o_sharedMainInstance = nil; { o_extended = [[VLCExtended alloc] init]; } - if (!nib_extended_loaded) + if ( !nib_extended_loaded ) { nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self]; [o_extended initStrings]; @@ -1729,7 +1864,7 @@ static VLCMain *_o_sharedMainInstance = nil; { o_sfilters = [[VLCsFilters alloc] init]; } - if (!nib_sfilters_loaded) + if ( !nib_sfilters_loaded ) { nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self]; [o_sfilters initStrings]; @@ -1742,32 +1877,34 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)showBookmarks:(id)sender { /* we need the wizard-nib for the bookmarks's extract functionality */ - if (!nib_wizard_loaded) + if ( !nib_wizard_loaded ) { nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self]; [o_wizard initStrings]; } - - if (!nib_bookmarks_loaded) - { + + if ( !nib_bookmarks_loaded ) nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self]; - [o_bookmarks showBookmarks]; - } else { - [o_bookmarks showBookmarks]; - } + + [o_bookmarks showBookmarks]; } - (IBAction)viewAbout:(id)sender { - if (!nib_about_loaded) - { + if( !nib_about_loaded ) nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; - [o_about showPanel]; - } else { - [o_about showPanel]; - } + + [o_about showAbout]; } +- (IBAction)showLicense:(id)sender +{ + if( !nib_about_loaded ) + nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; + + [o_about showGPL: sender]; +} + - (IBAction)viewPreferences:(id)sender { /* GRUIIIIIIIK */ @@ -1776,15 +1913,25 @@ static VLCMain *_o_sharedMainInstance = nil; [o_prefs showPrefs]; } +#ifdef UPDATE_CHECK - (IBAction)checkForUpdate:(id)sender +{/* FIXME + if( !nib_update_loaded ) + nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; + + [o_update showUpdateWindow]; +*/} +#endif + +- (IBAction)viewHelp:(id)sender { - if (!nib_update_loaded) + if( !nib_about_loaded ) { - nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; - [o_update showUpdateWindow]; - } else { - [o_update showUpdateWindow]; + nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; + [o_about showHelp]; } + else + [o_about showHelp]; } - (IBAction)openReadMe:(id)sender @@ -1804,14 +1951,6 @@ static VLCMain *_o_sharedMainInstance = nil; [[NSWorkspace sharedWorkspace] openURL: o_url]; } -- (IBAction)reportABug:(id)sender -{ - NSURL * o_url = [NSURL URLWithString: - @"http://www.videolan.org/support/bug-reporting.html"]; - - [[NSWorkspace sharedWorkspace] openURL: o_url]; -} - - (IBAction)openWebsite:(id)sender { NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"]; @@ -1819,15 +1958,6 @@ static VLCMain *_o_sharedMainInstance = nil; [[NSWorkspace sharedWorkspace] openURL: o_url]; } -- (IBAction)openLicense:(id)sender -{ - NSString * o_path = [[NSBundle mainBundle] - pathForResource: @"COPYING" ofType: nil]; - - [[NSWorkspace sharedWorkspace] openFile: o_path - withApplication: @"TextEdit"]; -} - - (IBAction)openForum:(id)sender { NSURL * o_url = [NSURL URLWithString: @"http://forum.videolan.org/"]; @@ -1898,6 +2028,8 @@ static VLCMain *_o_sharedMainInstance = nil; /*First, check if the playlist is visible*/ if( o_rect.size.height <= 200 ) { + o_restore_rect = o_rect; + 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 ) @@ -1906,23 +2038,33 @@ static VLCMain *_o_sharedMainInstance = nil; } else { o_rect.size.height = 500; } - + if ( o_size_with_playlist.width > [o_window minSize].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; + + NSRect screenRect = [[o_window screen] visibleFrame]; + if ( !NSContainsRect( screenRect, o_rect ) ) { + if ( NSMaxX(o_rect) > NSMaxX(screenRect) ) + o_rect.origin.x = ( NSMaxX(screenRect) - o_rect.size.width ); + if ( NSMinY(o_rect) < NSMinY(screenRect) ) + o_rect.origin.y = ( NSMinY(screenRect) ); + } + [o_btn_playlist setState: YES]; } else { + NSSize curSize = o_rect.size; /* make small */ o_rect.size.height = [o_window minSize].height; o_rect.size.width = [o_window minSize].width; @@ -1931,6 +2073,9 @@ static VLCMain *_o_sharedMainInstance = nil; 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; + [o_playlist_view setAutoresizesSubviews: NO]; [o_playlist_view removeFromSuperview]; [o_btn_playlist setState: NO]; @@ -1974,6 +2119,11 @@ static VLCMain *_o_sharedMainInstance = nil; return proposedFrameSize; } +- (void)windowDidMove:(NSNotification *)notif +{ + b_restore_size = false; +} + - (void)windowDidResize:(NSNotification *)notif { if( [o_window frame].size.height > 200 && b_small_window )