X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=a629db03941892adb1f65f47cc5403344c9d6aa9;hb=1405cf748a267b5e7ad21b606172a27d688eda56;hp=d8ce0920113242859a024e8565780006f864ba99;hpb=2010d13aa87441aedb456a4af539fe76f35914b6;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index d8ce092011..a629db0394 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-2007 the VideoLAN team + * Copyright (C) 2002-2008 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen @@ -32,11 +32,16 @@ #include #include +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif + #import "intf.h" #import "fspanel.h" #import "vout.h" #import "prefs.h" #import "playlist.h" +#import "playlistinfo.h" #import "controls.h" #import "about.h" #import "open.h" @@ -49,8 +54,10 @@ #import "update.h" #import "AppleRemote.h" #import "eyetv.h" +#import "simple_prefs.h" #import +#import /***************************************************************************** * Local prototypes. @@ -85,7 +92,7 @@ static void Run ( intf_thread_t *p_intf ); /***************************************************************************** * OpenIntf: initialize interface *****************************************************************************/ -int E_(OpenIntf) ( vlc_object_t *p_this ) +int OpenIntf ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; @@ -100,10 +107,9 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init]; p_intf->p_sys->o_sendport = [[NSPort port] retain]; - p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); - p_intf->b_play = VLC_TRUE; + p_intf->p_sys->p_sub = msg_Subscribe( p_intf ); p_intf->pf_run = Run; - p_intf->b_should_run_on_first_thread = VLC_TRUE; + p_intf->b_should_run_on_first_thread = true; return( 0 ); } @@ -111,10 +117,12 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) /***************************************************************************** * CloseIntf: destroy interface *****************************************************************************/ -void E_(CloseIntf) ( vlc_object_t *p_this ) +void CloseIntf ( vlc_object_t *p_this ) { intf_thread_t *p_intf = (intf_thread_t*) p_this; + [[VLCMain sharedInstance] setIntf: nil]; + msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub ); [p_intf->p_sys->o_sendport release]; @@ -123,6 +131,28 @@ void E_(CloseIntf) ( vlc_object_t *p_this ) free( p_intf->p_sys ); } +/***************************************************************************** + * KillerThread: Thread that kill the application + *****************************************************************************/ +static void * KillerThread( void *user_data ) +{ + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + + intf_thread_t *p_intf = user_data; + + vlc_object_lock ( p_intf ); + while( vlc_object_alive( p_intf ) ) + vlc_object_wait( p_intf ); + vlc_object_unlock( p_intf ); + + msg_Dbg( p_intf, "Killing the Mac OS X module" ); + + /* We are dead, terminate */ + [NSApp terminate: nil]; + [o_pool release]; + return NULL; +} + /***************************************************************************** * Run: main loop *****************************************************************************/ @@ -156,11 +186,17 @@ static void Run( intf_thread_t *p_intf ) [[VLCMain sharedInstance] setIntf: p_intf]; [NSBundle loadNibNamed: @"MainMenu" owner: NSApp]; + /* Setup a thread that will monitor the module killing */ + pthread_t killer_thread; + pthread_create( &killer_thread, NULL, KillerThread, p_intf ); + /* Install a jmpbuffer to where we can go back before the NSApp exit * see applicationWillTerminate: */ if(setjmp(jmpbuffer) == 0) [NSApp run]; + pthread_join( killer_thread, NULL ); + [o_pool release]; } @@ -236,10 +272,10 @@ 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_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; + 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; } @@ -252,7 +288,7 @@ 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 = VLC_TRUE; + p_intf->p_sys->b_intf_show = true; return VLC_SUCCESS; } @@ -264,7 +300,7 @@ 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 = VLC_TRUE; + p_intf->p_sys->b_fullscreen_update = true; return VLC_SUCCESS; } @@ -378,11 +414,13 @@ static VLCMain *_o_sharedMainInstance = nil; - (id)init { - if( _o_sharedMainInstance) { + if( _o_sharedMainInstance) + { [self dealloc]; - } else { + return _o_sharedMainInstance; + } + else _o_sharedMainInstance = [super init]; - } o_about = [[VLAboutBox alloc] init]; o_prefs = nil; @@ -392,8 +430,11 @@ static VLCMain *_o_sharedMainInstance = nil; o_bookmarks = [[VLCBookmarks alloc] init]; o_embedded_list = [[VLCEmbeddedList alloc] init]; o_interaction_list = [[VLCInteractionList alloc] init]; + o_info = [[VLCInfo alloc] init]; o_sfilters = nil; +#ifdef UPDATE_CHECK o_update = [[VLCUpdate alloc] init]; +#endif i_lastShownVolume = -1; @@ -518,34 +559,81 @@ static VLCMain *_o_sharedMainInstance = nil; p_playlist = pl_Yield( p_intf ); - /* Check if we need to start playing */ - if( p_intf->b_play ) - { - playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE ); - } var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT); - val.b_bool = VLC_FALSE; + val.b_bool = false; var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self); - var_AddCallback( p_playlist, "intf-show", ShowController, self); + var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self); 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; + p_intf->b_interaction = true; /* update the playmode stuff */ - p_intf->p_sys->b_playmode_update = VLC_TRUE; + p_intf->p_sys->b_playmode_update = true; [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(refreshVoutDeviceMenu:) name: NSApplicationDidChangeScreenParametersNotification object: nil]; - + + 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]; + nib_main_loaded = TRUE; } +- (void)controlTintChanged +{ + BOOL b_playing = NO; + + if( [o_btn_play alternateImage] == o_img_play_pressed ) + b_playing = YES; + + if( [NSColor currentControlTint] == NSGraphiteControlTint ) + { + o_img_play_pressed = [NSImage imageNamed: @"play_graphite"]; + o_img_pause_pressed = [NSImage imageNamed: @"pause_graphite"]; + + [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_graphite"]]; + [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_graphite"]]; + [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_graphite"]]; + [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_graphite"]]; + [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_graphite"]]; + [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]]; + [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_graphite"]]; + [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_graphite"]]; + } + else + { + o_img_play_pressed = [NSImage imageNamed: @"play_blue"]; + o_img_pause_pressed = [NSImage imageNamed: @"pause_blue"]; + + [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_blue"]]; + [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_blue"]]; + [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_blue"]]; + [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_blue"]]; + [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_blue"]]; + [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]]; + [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_blue"]]; + [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_blue"]]; + } + + if( b_playing ) + [o_btn_play setAlternateImage: o_img_play_pressed]; + else + [o_btn_play setAlternateImage: o_img_pause_pressed]; +} + - (void)initStrings { [o_window setTitle: _NS("VLC - Controller")]; @@ -585,6 +673,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_open_file setTitle: _NS("Quick 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...")]; [o_mi_open_recent setTitle: _NS("Open Recent")]; [o_mi_open_recent_cm setTitle: _NS("Clear Menu")]; [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")]; @@ -643,8 +732,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")]; [o_mi_crop setTitle: _NS("Crop")]; [o_mu_crop setTitle: _NS("Crop")]; - [o_mi_screen setTitle: _NS("Video Device")]; - [o_mu_screen setTitle: _NS("Video Device")]; + [o_mi_screen setTitle: _NS("Fullscreen Video Device")]; + [o_mu_screen setTitle: _NS("Fullscreen Video Device")]; [o_mi_subtitle setTitle: _NS("Subtitles Track")]; [o_mu_subtitle setTitle: _NS("Subtitles Track")]; [o_mi_deinterlace setTitle: _NS("Deinterlace")]; @@ -669,6 +758,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mu_help setTitle: _NS("Help")]; [o_mi_help setTitle: _NS("VLC media player Help...")]; [o_mi_readme setTitle: _NS("ReadMe / FAQ...")]; + [o_mi_license setTitle: _NS("License")]; [o_mi_documentation setTitle: _NS("Online Documentation...")]; [o_mi_website setTitle: _NS("VideoLAN Website...")]; [o_mi_donation setTitle: _NS("Make a donation...")]; @@ -691,8 +781,6 @@ static VLCMain *_o_sharedMainInstance = nil; [o_vmi_mute setTitle: _NS("Mute")]; [o_vmi_fullscreen setTitle: _NS("Fullscreen")]; [o_vmi_snapshot setTitle: _NS("Snapshot")]; - - [o_info_window setTitle: _NS("Media Information")]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification @@ -700,22 +788,19 @@ static VLCMain *_o_sharedMainInstance = nil; o_msg_lock = [[NSLock alloc] init]; o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain]; - o_img_play = [[NSImage imageNamed: @"play"] retain]; - o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain]; - o_img_pause = [[NSImage imageNamed: @"pause"] retain]; - o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain]; - [p_intf->p_sys->o_sendport setDelegate: self]; [[NSRunLoop currentRunLoop] addPort: p_intf->p_sys->o_sendport forMode: NSDefaultRunLoopMode]; + /* FIXME: don't poll */ [NSTimer scheduledTimerWithTimeInterval: 0.5 target: self selector: @selector(manageIntf:) userInfo: nil repeats: FALSE]; - [NSThread detachNewThreadSelector: @selector(manage) - toTarget: self withObject: nil]; + /* FIXME: don't poll */ + manageThread = [[NSThread alloc] initWithTarget:self selector:@selector(manage) + object: nil]; [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf var: "intf-add" selector: @selector(toggleVar:)]; @@ -750,7 +835,7 @@ static VLCMain *_o_sharedMainInstance = nil; return( TRUE ); } -- (NSString *)localizedString:(char *)psz +- (NSString *)localizedString:(const char *)psz { NSString * o_str = nil; @@ -758,7 +843,7 @@ static VLCMain *_o_sharedMainInstance = nil; { o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease]; - if ( o_str == NULL ) + if( o_str == NULL ) { msg_Err( VLCIntf, "could not translate: %s", psz ); return( @"" ); @@ -776,7 +861,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* When user click in the Dock icon our double click in the finder */ - (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows { - if (!hasVisibleWindows) + if(!hasVisibleWindows) [o_window makeKeyAndOrderFront:self]; return YES; @@ -784,13 +869,15 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)applicationDidFinishLaunching:(NSNotification *)aNotification { +#ifdef UPDATE_CHECK /* Check for update silently on startup */ - if ( !nib_update_loaded ) + if( !nib_update_loaded ) nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; 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]; @@ -811,7 +898,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)computerWillSleep: (NSNotification *)notification { /* Pause */ - if ( p_intf->p_sys->i_play_status == PLAYING_S ) + if( p_intf->p_sys->i_play_status == PLAYING_S ) { vlc_value_t val; val.i_int = config_GetInt( p_intf, "key-play-pause" ); @@ -823,7 +910,7 @@ static VLCMain *_o_sharedMainInstance = nil; increase/decrease as long as the user holds the left/right, plus/minus button */ - (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber { - if (b_remote_button_hold) + if(b_remote_button_hold) { switch([buttonIdentifierNumber intValue]) { @@ -840,7 +927,7 @@ static VLCMain *_o_sharedMainInstance = nil; [o_controls volumeDown: self]; break; } - if (b_remote_button_hold) + if(b_remote_button_hold) { /* trigger event */ [self performSelector:@selector(executeHoldActionForRemoteButton:) @@ -858,7 +945,7 @@ static VLCMain *_o_sharedMainInstance = nil; switch( buttonIdentifier ) { case kRemoteButtonPlay: - if (count >= 2) { + if(count >= 2) { [o_controls toogleFullscreen:self]; } else { [o_controls play: self]; @@ -904,7 +991,7 @@ static VLCMain *_o_sharedMainInstance = nil; allowLossyConversion: NO]; char * psz_string; - if ( o_data == nil ) + if( o_data == nil ) { o_data = [id dataUsingEncoding: NSUTF8StringEncoding allowLossyConversion: YES]; @@ -954,7 +1041,7 @@ static VLCMain *_o_sharedMainInstance = nil; effectiveRange: &effectiveRange]; charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange actualGlyphRange: &effectiveRange]; - if ([o_wrapped lineRangeForRange: + if([o_wrapped lineRangeForRange: NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) { [o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted]; breaksInserted++; @@ -1028,62 +1115,79 @@ static VLCMain *_o_sharedMainInstance = nil; - (id)getControls { - if ( o_controls ) - { + if( o_controls ) return o_controls; - } + return nil; } +- (id)getSimplePreferences +{ + if( !o_sprefs ) + return nil; + + if( !nib_prefs_loaded ) + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + + return o_sprefs; +} + +- (id)getPreferences +{ + if( !o_prefs ) + return nil; + + if( !nib_prefs_loaded ) + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + + return o_prefs; +} + - (id)getPlaylist { if( o_playlist ) return o_playlist; + return nil; } - (id)getInfo { - if ( o_info ) - { + if( o_info ) return o_info; - } + return nil; } - (id)getWizard { - if ( o_wizard ) - { + if( o_wizard ) return o_wizard; - } + return nil; } - (id)getBookmarks { - if ( o_bookmarks ) - { + if( o_bookmarks ) return o_bookmarks; - } + return nil; } - (id)getEmbeddedList { if( o_embedded_list ) - { return o_embedded_list; - } + return nil; } - (id)getInteractionList { if( o_interaction_list ) - { return o_interaction_list; - } + return nil; } @@ -1092,7 +1196,6 @@ static VLCMain *_o_sharedMainInstance = nil; if( o_main_pgbar ) return o_main_pgbar; - msg_Err( p_intf, "main interface progress bar item wasn't found" ); return nil; } @@ -1112,6 +1215,7 @@ static VLCMain *_o_sharedMainInstance = nil; { if( o_eyetv ) return o_eyetv; + return nil; } @@ -1134,11 +1238,11 @@ static VLCMain *_o_sharedMainInstance = nil; vlc_object_release( p_playlist ); - while( !intf_ShouldDie( p_intf ) ) + vlc_object_lock( p_intf ); + while( vlc_object_alive( p_intf ) ) { vlc_mutex_lock( &p_intf->change_lock ); - if( p_intf->p_sys->p_input == NULL ) { p_intf->p_sys->p_input = p_playlist->p_input; @@ -1147,13 +1251,13 @@ static VLCMain *_o_sharedMainInstance = nil; if( p_intf->p_sys->p_input ) { msg_Dbg( p_intf, "input has changed, refreshing interface" ); - p_intf->p_sys->b_input_update = VLC_TRUE; + p_intf->p_sys->b_input_update = true; } } else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead ) { /* input stopped */ - p_intf->p_sys->b_intf_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = true; p_intf->p_sys->i_play_status = END_S; msg_Dbg( p_intf, "input has stopped, refreshing interface" ); p_intf->p_sys->p_input = NULL; @@ -1163,8 +1267,11 @@ static VLCMain *_o_sharedMainInstance = nil; [self manageVolumeSlider]; vlc_mutex_unlock( &p_intf->change_lock ); + vlc_object_unlock( p_intf ); msleep( 100000 ); + vlc_object_lock( p_intf ); } + vlc_object_unlock( p_intf ); [o_pool release]; } @@ -1174,8 +1281,11 @@ static VLCMain *_o_sharedMainInstance = nil; playlist_t * p_playlist; input_thread_t * p_input; - if( p_intf->p_libvlc->b_die == VLC_TRUE ) + vlc_object_lock( p_intf ); + + if( !vlc_object_alive( p_intf ) ) { + vlc_object_unlock( p_intf ); [o_timer invalidate]; return; } @@ -1183,32 +1293,32 @@ static VLCMain *_o_sharedMainInstance = nil; if( p_intf->p_sys->b_input_update ) { /* Called when new input is opened */ - p_intf->p_sys->b_current_title_update = VLC_TRUE; - p_intf->p_sys->b_intf_update = VLC_TRUE; - p_intf->p_sys->b_input_update = VLC_FALSE; + 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; } if( p_intf->p_sys->b_intf_update ) { - vlc_bool_t b_input = VLC_FALSE; - vlc_bool_t b_plmul = VLC_FALSE; - vlc_bool_t b_control = VLC_FALSE; - vlc_bool_t b_seekable = VLC_FALSE; - vlc_bool_t b_chapters = VLC_FALSE; + bool b_input = false; + bool b_plmul = false; + bool b_control = false; + bool b_seekable = false; + bool b_chapters = false; playlist_t * p_playlist = pl_Yield( p_intf ); - /** \todo fix i_size use */ + /* TODO: fix i_size use */ b_plmul = p_playlist->items.i_size > 1; - p_input = p_playlist->p_input; + + p_input = vlc_object_find( p_playlist, VLC_OBJECT_INPUT, + FIND_CHILD ); if( ( b_input = ( p_input != NULL ) ) ) { /* seekable streams */ - vlc_object_yield( p_input ); b_seekable = var_GetBool( p_input, "seekable" ); - /* check wether slow/fast motion is possible*/ + /* check whether slow/fast motion is possible */ b_control = p_input->b_can_pace_control; - /* chapters & titles */ //b_chapters = p_input->stream.i_area_nb > 1; @@ -1224,45 +1334,47 @@ 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 andTime: @"0:00:00"]; + [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]; - p_intf->p_sys->b_intf_update = VLC_FALSE; + p_intf->p_sys->b_current_title_update = true; + + p_intf->p_sys->b_intf_update = false; } if( p_intf->p_sys->b_playmode_update ) { [o_playlist playModeUpdated]; - p_intf->p_sys->b_playmode_update = VLC_FALSE; + p_intf->p_sys->b_playmode_update = false; } if( p_intf->p_sys->b_playlist_update ) { [o_playlist playlistUpdated]; - p_intf->p_sys->b_playlist_update = VLC_FALSE; + p_intf->p_sys->b_playlist_update = false; } if( p_intf->p_sys->b_fullscreen_update ) { - p_intf->p_sys->b_fullscreen_update = VLC_FALSE; + p_intf->p_sys->b_fullscreen_update = false; } if( p_intf->p_sys->b_intf_show ) { [o_window makeKeyAndOrderFront: self]; - p_intf->p_sys->b_intf_show = VLC_FALSE; + p_intf->p_sys->b_intf_show = false; } p_playlist = pl_Yield( p_intf ); - p_input = p_playlist->p_input; + p_input = vlc_object_find( p_playlist, VLC_OBJECT_INPUT, + FIND_CHILD ); 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 ) { @@ -1274,10 +1386,11 @@ static VLCMain *_o_sharedMainInstance = nil; vlc_object_release( p_playlist ); return; } - o_temp = [NSString stringWithUTF8String: - p_playlist->status.p_item->p_input->psz_name]; - if( o_temp == NULL ) - o_temp = [NSString stringWithCString: + 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]; @@ -1293,8 +1406,8 @@ static VLCMain *_o_sharedMainInstance = nil; /* 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_input, "position", &pos ); @@ -1302,12 +1415,9 @@ static VLCMain *_o_sharedMainInstance = nil; [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: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; @@ -1341,7 +1451,8 @@ static VLCMain *_o_sharedMainInstance = nil; else { p_intf->p_sys->i_play_status = END_S; - p_intf->p_sys->b_intf_update = VLC_TRUE; + p_intf->p_sys->b_intf_update = true; + p_intf->p_sys->b_playlist_update = true; [self playStatusUpdated: p_intf->p_sys->i_play_status]; [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; [self setSubmenusEnabled: FALSE]; @@ -1356,6 +1467,7 @@ static VLCMain *_o_sharedMainInstance = nil; [NSTimer scheduledTimerWithTimeInterval: 0.3 target: self selector: @selector(manageIntf:) userInfo: nil repeats: FALSE]; + vlc_object_unlock( p_intf ); } - (void)setupMenus @@ -1385,7 +1497,7 @@ static VLCMain *_o_sharedMainInstance = nil; aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT, FIND_ANYWHERE ); - if ( p_aout != NULL ) + if( p_aout != NULL ) { [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout var: "audio-channels" selector: @selector(toggleVar:)]; @@ -1401,7 +1513,7 @@ static VLCMain *_o_sharedMainInstance = nil; vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE ); - if ( p_vout != NULL ) + if( p_vout != NULL ) { vlc_object_t * p_dec_obj; @@ -1421,7 +1533,7 @@ static VLCMain *_o_sharedMainInstance = nil; (vlc_object_t *)p_vout, VLC_OBJECT_DECODER, FIND_PARENT ); - if ( p_dec_obj != NULL ) + if( p_dec_obj != NULL ) { [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target: (vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector: @@ -1482,11 +1594,12 @@ static VLCMain *_o_sharedMainInstance = nil; { NSString *o_temp; 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]; + 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]; vlc_object_release( p_input ); vlc_object_release( p_playlist ); @@ -1637,8 +1750,8 @@ static VLCMain *_o_sharedMainInstance = nil; { 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.; @@ -1646,12 +1759,8 @@ static VLCMain *_o_sharedMainInstance = nil; [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: f_updated andTime: o_time]; [o_embedded_window setTime: o_time position: f_updated]; @@ -1666,10 +1775,10 @@ static VLCMain *_o_sharedMainInstance = nil; vout_thread_t * p_vout; int returnedValue = 0; - /* Stop playback */ - p_playlist = pl_Yield( p_intf ); - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); + msg_Dbg( p_intf, "Terminating" ); + + [manageThread cancel]; + [manageThread release]; /* make sure that the current volume is saved */ config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume ); @@ -1680,92 +1789,68 @@ static VLCMain *_o_sharedMainInstance = nil; returnedValue ); /* save the prefs if they were changed in the extended panel */ - if (o_extended && [o_extended getConfigChanged]) + if(o_extended && [o_extended getConfigChanged]) { [o_extended savePrefs]; } - p_intf->b_interaction = VLC_FALSE; + p_intf->b_interaction = 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]; + [[NSNotificationCenter defaultCenter] removeObserver: self]; /* 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 ) + * will be called later on */ + + if( nib_about_loaded ) [o_about release]; - - if( nib_open_loaded && o_open ) - [o_open release]; - - if( nib_extended_loaded && o_extended ) + + if( nib_prefs_loaded ) { - [o_extended collapsAll]; - [o_extended release]; + [o_sprefs release]; + [o_prefs 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( nib_open_loaded ) + [o_open release]; - if( o_img_pause_pressed != nil ) + if( nib_extended_loaded ) { - [o_img_pause_pressed release]; - o_img_pause_pressed = nil; + [o_extended release]; } - if( o_img_pause_pressed != nil ) - { - [o_img_pause_pressed release]; - o_img_pause_pressed = nil; - } + if( nib_bookmarks_loaded ) + [o_bookmarks release]; - if( o_img_pause != nil ) - { - [o_img_pause release]; - o_img_pause = nil; - } + if( nib_info_loaded ) + [o_info release]; + + if( nib_wizard_loaded ) + [o_wizard release]; + + [o_embedded_list release]; + [o_interaction_list release]; + [o_eyetv release]; - if( o_img_play != nil ) - { - [o_img_play release]; - o_img_play = nil; - } + [o_img_pause_pressed release]; + [o_img_play_pressed release]; + [o_img_pause release]; + [o_img_play release]; - if( o_msg_arr != nil ) - { - [o_msg_arr removeAllObjects]; - [o_msg_arr release]; - o_msg_arr = nil; - } + [o_msg_arr removeAllObjects]; + [o_msg_arr release]; - if( o_msg_lock != nil ) - { - [o_msg_lock release]; - o_msg_lock = nil; - } + [o_msg_lock release]; /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; - vlc_object_kill( p_intf ); + vlc_object_kill( p_intf->p_libvlc ); /* Go back to Run() and make libvlc exit properly */ - longjmp( jmpbuffer, 1 ); + if( jmpbuffer ) + longjmp( jmpbuffer, 1 ); /* not reached */ } @@ -1783,7 +1868,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]; @@ -1795,7 +1880,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]; @@ -1807,7 +1892,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]; @@ -1819,7 +1904,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]; @@ -1829,9 +1914,21 @@ static VLCMain *_o_sharedMainInstance = nil; } } +- (IBAction)intfOpenCapture:(id)sender +{ + if( !nib_open_loaded ) + { + nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self]; + [o_open awakeFromNib]; + [o_open openCapture]; + } else { + [o_open openCapture]; + } +} + - (IBAction)showWizard:(id)sender { - if ( !nib_wizard_loaded ) + if( !nib_wizard_loaded ) { nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self]; [o_wizard initStrings]; @@ -1845,27 +1942,22 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)showExtended:(id)sender { - if ( o_extended == nil ) - { + if( o_extended == 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]; - [o_extended showPanel]; - } else { - [o_extended showPanel]; - } + + [o_extended showPanel]; } - (IBAction)showSFilters:(id)sender { - if ( o_sfilters == nil ) + if( o_sfilters == 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]; @@ -1878,46 +1970,61 @@ 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 ) - { nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; - [o_about showAbout]; - } else { - [o_about showAbout]; - } + + [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 */ - if( o_prefs == nil ) - o_prefs = [[VLCPrefs alloc] init]; - [o_prefs showPrefs]; + if( !nib_prefs_loaded ) + { + nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self]; + o_sprefs = [[VLCSimplePrefs alloc] init]; + o_prefs= [[VLCPrefs alloc] init]; + } + + if( sender == o_mi_sprefs ) + { + [o_sprefs showSimplePrefs]; + } + else + [o_prefs showPrefs]; } - (IBAction)checkForUpdate:(id)sender { +#ifdef UPDATE_CHECK if( !nib_update_loaded ) nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; - [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.") ); +#endif } - (IBAction)viewHelp:(id)sender @@ -1975,14 +2082,14 @@ static VLCMain *_o_sharedMainInstance = nil; stringByExpandingTildeInPath]; - if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) + if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] ) { [[NSWorkspace sharedWorkspace] openFile: o_path withApplication: @"Console"]; } else { - NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") ); + 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.") ); } } @@ -1997,6 +2104,14 @@ static VLCMain *_o_sharedMainInstance = nil; [o_msgs_panel makeKeyAndOrderFront: sender]; } +- (IBAction)showInformationPanel:(id)sender +{ + if(! nib_info_loaded ) + nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self]; + + [o_info initPanel]; +} + - (void)windowDidBecomeKey:(NSNotification *)o_notification { if( [o_notification object] == o_msgs_panel ) @@ -2029,14 +2144,14 @@ static VLCMain *_o_sharedMainInstance = nil; 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 > 200 ) { o_rect.size.height = o_size_with_playlist.height; } else { o_rect.size.height = 500; } - if ( o_size_with_playlist.width > [o_window minSize].width ) + if( o_size_with_playlist.width > [o_window minSize].width ) { o_rect.size.width = o_size_with_playlist.width; } else { @@ -2050,10 +2165,10 @@ static VLCMain *_o_sharedMainInstance = nil; [o_window minSize].height; NSRect screenRect = [[o_window screen] visibleFrame]; - if ( !NSContainsRect( screenRect, o_rect ) ) { - if ( NSMaxX(o_rect) > NSMaxX(screenRect) ) + 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) ) + if( NSMinY(o_rect) < NSMinY(screenRect) ) o_rect.origin.y = ( NSMinY(screenRect) ); } @@ -2070,7 +2185,7 @@ 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 ) + if( b_restore_size ) o_rect = o_restore_rect; [o_playlist_view setAutoresizesSubviews: NO];