X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Fintf.m;h=046b74f207322290838a2ca7451b947fcbe68c92;hb=3dea2eae35f0bf19e0549a79b86e04f8ca7f5bf4;hp=efdc68495f1c73916e79f921551c928f5f256399;hpb=f3ccaec1c592a77f34044b0f36cdc47343e9563d;p=vlc diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index efdc68495f..046b74f207 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -1,12 +1,13 @@ /***************************************************************************** * intf.m: MacOS X interface module ***************************************************************************** - * Copyright (C) 2002-2005 the VideoLAN team + * Copyright (C) 2002-2006 the VideoLAN team * $Id$ * * Authors: Jon Lech Johansen * Christophe Massiot * Derk-Jan Hartman + * Felix 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 @@ -20,7 +21,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA. + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. *****************************************************************************/ /***************************************************************************** @@ -31,18 +32,22 @@ #include #include -#include "intf.h" -#include "vout.h" -#include "prefs.h" -#include "playlist.h" -#include "controls.h" -#include "about.h" -#include "open.h" -#include "wizard.h" -#include "extended.h" -#include "bookmarks.h" -#include "sfilters.h" -/*#include "update.h"*/ +#import "intf.h" +#import "fspanel.h" +#import "vout.h" +#import "prefs.h" +#import "playlist.h" +#import "controls.h" +#import "about.h" +#import "open.h" +#import "wizard.h" +#import "extended.h" +#import "bookmarks.h" +#import "sfilters.h" +#import "interaction.h" +#import "embeddedwindow.h" +#import "update.h" +#import "AppleRemote.h" /***************************************************************************** * Local prototypes. @@ -73,7 +78,7 @@ int E_(OpenIntf) ( vlc_object_t *p_this ) [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 ); + p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL ); p_intf->b_play = VLC_TRUE; p_intf->pf_run = Run; @@ -178,13 +183,26 @@ int ExecuteOnMainThread( id target, SEL sel, void * p_arg ) * playlistChanged: Callback triggered by the intf-change playlist * variable, to let the intf update the playlist. *****************************************************************************/ -int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, +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 = TRUE; - p_intf->p_sys->b_intf_update = TRUE; - p_intf->p_sys->b_playmode_update = TRUE; + 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; + return VLC_SUCCESS; +} + +/***************************************************************************** + * ShowController: Callback triggered by the show-intf playlist variable + * through the ShowIntf-control-intf, to let us show the controller-win; + * usually when in fullscreen-mode + *****************************************************************************/ +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; return VLC_SUCCESS; } @@ -192,14 +210,32 @@ int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable, * FullscreenChanged: Callback triggered by the fullscreen-change playlist * variable, to let the intf update the controller. *****************************************************************************/ -int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable, +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; + p_intf->p_sys->b_fullscreen_update = VLC_TRUE; return VLC_SUCCESS; } +/***************************************************************************** + * InteractCallback: Callback triggered by the interaction + * variable, 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 ) +{ + NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init]; + 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; +} static struct { @@ -297,7 +333,7 @@ static VLCMain *_o_sharedMainInstance = nil; } else { _o_sharedMainInstance = [super init]; } - + o_about = [[VLAboutBox alloc] init]; o_prefs = nil; o_open = [[VLCOpen alloc] init]; @@ -305,10 +341,15 @@ 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_sfilters = nil; - /*o_update = [[VLCUpdate alloc] init];*/ + o_update = [[VLCUpdate alloc] init]; i_lastShownVolume = -1; + + o_remote = [[AppleRemote alloc] init]; + [o_remote setDelegate: _o_sharedMainInstance]; + return _o_sharedMainInstance; } @@ -415,23 +456,30 @@ 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_LockControl( p_playlist, PLAYLIST_AUTOPLAY ); + } + 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, "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 ); + + var_Create( p_intf, "interaction", VLC_VAR_ADDRESS ); + var_AddCallback( p_intf, "interaction", InteractCallback, self ); + p_intf->b_interaction = VLC_TRUE; + + /* update the playmode stuff */ + p_intf->p_sys->b_playmode_update = VLC_TRUE; - [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )]; - vlc_object_release( p_playlist ); - } nib_main_loaded = TRUE; } @@ -459,7 +507,7 @@ static VLCMain *_o_sharedMainInstance = nil; /* main menu */ [o_mi_about setTitle: [_NS("About VLC media player") \ stringByAppendingString: @"..."]]; -/* [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];*/ + [o_mi_checkForUpdate setTitle: _NS("Check for Update...")]; [o_mi_prefs setTitle: _NS("Preferences...")]; [o_mi_add_intf setTitle: _NS("Add Interface")]; [o_mu_add_intf setTitle: _NS("Add Interface")]; @@ -528,6 +576,10 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_snapshot setTitle: _NS("Snapshot")]; [o_mi_videotrack setTitle: _NS("Video Track")]; [o_mu_videotrack setTitle: _NS("Video Track")]; + [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")]; + [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_subtitle setTitle: _NS("Subtitles Track")]; @@ -545,8 +597,9 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_extended setTitle: _NS("Extended Controls")]; [o_mi_bookmarks setTitle: _NS("Bookmarks")]; [o_mi_playlist setTitle: _NS("Playlist")]; - [o_mi_info setTitle: _NS("Info")]; + [o_mi_info setTitle: _NS("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")]; @@ -565,18 +618,19 @@ 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")]; + [o_vmi_prev setTitle: _NS("Previous")]; + [o_vmi_next setTitle: _NS("Next")]; + [o_vmi_volup setTitle: _NS("Volume Up")]; + [o_vmi_voldown setTitle: _NS("Volume Down")]; + [o_vmi_mute setTitle: _NS("Mute")]; + [o_vmi_fullscreen setTitle: _NS("Fullscreen")]; + [o_vmi_snapshot setTitle: _NS("Snapshot")]; - /* error panel */ - [o_error setTitle: _NS("Error")]; - [o_err_lbl setStringValue: _NS("An error has occurred which probably " \ - "prevented the execution of your request:")]; - [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \ - "please follow the instructions at:")]; - [o_err_btn_msgs setTitle: _NS("Open Messages Window")]; - [o_err_btn_dismiss setTitle: _NS("Dismiss")]; - [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")]; - - [o_info_window setTitle: _NS("Info")]; + [o_info_window setTitle: _NS("Information")]; } - (void)applicationWillFinishLaunching:(NSNotification *)o_notification @@ -623,15 +677,106 @@ static VLCMain *_o_sharedMainInstance = nil; if( psz != NULL ) { o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease]; + + if ( o_str == NULL ) + { + msg_Err( VLCIntf, "could not translate: %s", psz ); + return( @"" ); + } } - if ( o_str == NULL ) + else { - msg_Err( VLCIntf, "could not translate: %s", psz ); + msg_Warn( VLCIntf, "can't translate empty strings" ); + return( @"" ); } return( o_str ); } +/* Listen to the remote in exclusive mode, only when VLC is the active + application */ +- (void)applicationDidBecomeActive:(NSNotification *)aNotification +{ + [o_remote startListening: self]; +} +- (void)applicationDidResignActive:(NSNotification *)aNotification +{ + [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 +{ + if (b_left_right_remote_button_hold) { + switch([buttonIdentifierNumber intValue]) { + case kRemoteButtonRight_Hold: + [o_controls forward: self]; + break; + case kRemoteButtonLeft_Hold: + [o_controls backward: self]; + break; + } + if (b_left_right_remote_button_hold) { + /* trigger event */ + [self performSelector:@selector(triggerMovieStepForRemoteButton:) + withObject:buttonIdentifierNumber + afterDelay:0.25]; + } + } +} + +/* Apple Remote callback */ +- (void)appleRemoteButton:(AppleRemoteEventIdentifier)buttonIdentifier + pressedDown:(BOOL)pressedDown +{ + switch( buttonIdentifier ) + { + case kRemoteButtonPlay: + [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]; + } + 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]; + } + break; + case kRemoteButtonRight: + [o_controls next: self]; + break; + case kRemoteButtonLeft: + [o_controls prev: self]; + break; + case kRemoteButtonRight_Hold: + case kRemoteButtonLeft_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:) + withObject:buttonIdentifierNumber]; + } + break; + case kRemoteButtonMenu: + [o_controls windowAction: self]; + break; + default: + /* Add here whatever you want other buttons to do */ + break; + } +} + - (char *)delocalizeString:(NSString *)id { NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding @@ -645,7 +790,7 @@ static VLCMain *_o_sharedMainInstance = nil; psz_string = malloc( [o_data length] + 1 ); [o_data getBytes: psz_string]; psz_string[ [o_data length] ] = '\0'; - msg_Err( VLCIntf, "cannot convert to wanted encoding: %s", + msg_Err( VLCIntf, "cannot convert to the requested encoding: %s", psz_string ); } else @@ -716,7 +861,7 @@ static VLCMain *_o_sharedMainInstance = nil; int i; val.i_int = 0; - p_hotkeys = p_intf->p_vlc->p_hotkeys; + p_hotkeys = p_intf->p_libvlc->p_hotkeys; i_pressed_modifiers = [o_event modifierFlags]; @@ -752,7 +897,7 @@ static VLCMain *_o_sharedMainInstance = nil; { if( p_hotkeys[i].i_key == val.i_int ) { - var_Set( p_intf->p_vlc, "key-pressed", val ); + var_Set( p_intf->p_libvlc, "key-pressed", val ); return YES; } } @@ -771,10 +916,8 @@ static VLCMain *_o_sharedMainInstance = nil; - (id)getPlaylist { - if ( o_playlist ) - { + if( o_playlist ) return o_playlist; - } return nil; } @@ -814,6 +957,36 @@ static VLCMain *_o_sharedMainInstance = nil; return nil; } +- (id)getInteractionList +{ + if( o_interaction_list ) + { + return o_interaction_list; + } + return nil; +} + +- (id)getMainIntfPgbar +{ + if( o_main_pgbar ) + return o_main_pgbar; + + msg_Err( p_intf, "main interface progress bar item wasn't found" ); + return nil; +} + +- (id)getControllerWindow +{ + if( o_window ) + return o_window; + return nil; +} + +- (id)getVoutMenu +{ + return o_vout_menu; +} + - (void)manage { playlist_t * p_playlist; @@ -823,48 +996,41 @@ 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 ); -#define p_input p_intf->p_sys->p_input - if( p_input == NULL ) + if( p_intf->p_sys->p_input == NULL ) { - p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT, - FIND_ANYWHERE ); + p_intf->p_sys->p_input = p_playlist->p_input; - /* Refresh the interface */ - if( p_input ) + /* Refresh the interface */ + 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; } } - else if( p_input->b_die || p_input->b_dead ) + 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->i_play_status = END_S; [self setScrollField: _NS("VLC media player") stopAfter:-1]; - vlc_object_release( p_input ); - p_input = NULL; + msg_Dbg( p_intf, "input has stopped, refreshing interface" ); + p_intf->p_sys->p_input = NULL; } -#undef p_input /* Manage volume status */ [self manageVolumeSlider]; @@ -879,13 +1045,12 @@ static VLCMain *_o_sharedMainInstance = nil; { vlc_value_t val; - if( p_intf->p_vlc->b_die == VLC_TRUE ) + if( p_intf->p_libvlc->b_die == VLC_TRUE ) { [o_timer invalidate]; return; } -#define p_input p_intf->p_sys->p_input if( p_intf->p_sys->b_input_update ) { /* Called when new input is opened */ @@ -901,23 +1066,23 @@ 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 ); + playlist_t * p_playlist = pl_Yield( p_intf ); b_plmul = p_playlist->i_size > 1; vlc_object_release( p_playlist ); - if( ( b_input = ( p_input != NULL ) ) ) + if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) ) { + vlc_object_yield( p_intf->p_sys->p_input ); /* seekable streams */ - var_Get( p_input, "seekable", &val); - b_seekable = val.b_bool; + b_seekable = var_GetBool( p_intf->p_sys->p_input, "seekable" ); /* check wether slow/fast motion is possible*/ - b_control = p_input->input.b_can_pace_control; + b_control = p_intf->p_sys->p_input->input.b_can_pace_control; /* chapters & titles */ - //b_chapters = p_input->stream.i_area_nb > 1; + //b_chapters = p_intf->p_sys->p_input->stream.i_area_nb > 1; + vlc_object_release( p_intf->p_sys->p_input ); } [o_btn_stop setEnabled: b_input]; @@ -929,6 +1094,10 @@ 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"]; + [[[self getControls] getFSPanel] setSeekable: b_seekable]; + + [o_embedded_window setSeekable: b_seekable]; p_intf->p_sys->b_intf_update = VLC_FALSE; } @@ -946,16 +1115,22 @@ 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 ); + playlist_t * p_playlist = pl_Yield( p_intf ); var_Get( p_playlist, "fullscreen", &val ); - [o_btn_fullscreen setState: val.b_bool]; + [o_embedded_window setFullscreen: val.b_bool]; vlc_object_release( p_playlist ); p_intf->p_sys->b_fullscreen_update = VLC_FALSE; } - if( p_input && !p_input->b_die ) + if( p_intf->p_sys->b_intf_show ) + { + [o_window makeKeyAndOrderFront: self]; + + p_intf->p_sys->b_intf_show = VLC_FALSE; + } + + if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die ) { vlc_value_t val; @@ -963,22 +1138,23 @@ static VLCMain *_o_sharedMainInstance = nil; { NSString *o_temp; vout_thread_t *p_vout; - playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ); + playlist_t * p_playlist = pl_Yield( p_intf ); - if( p_playlist == NULL || p_playlist->status.p_item == NULL ) + if( p_playlist->status.p_item == NULL ) { + vlc_object_release( p_playlist ); return; } o_temp = [NSString stringWithUTF8String: - p_playlist->status.p_item->input.psz_name]; + p_playlist->status.p_item->p_input->psz_name]; if( o_temp == NULL ) o_temp = [NSString stringWithCString: - p_playlist->status.p_item->input.psz_name]; + p_playlist->status.p_item->p_input->psz_name]; [self setScrollField: o_temp stopAfter:-1]; + [[[self getControls] getFSPanel] setStreamTitle: o_temp]; - p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, - FIND_ANYWHERE ); + p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT, + FIND_PARENT ); if( p_vout != NULL ) { id o_vout_wnd; @@ -986,9 +1162,12 @@ static VLCMain *_o_sharedMainInstance = nil; while( ( o_vout_wnd = [o_enum nextObject] ) ) { - if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] ) + if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] + || [[[VLCMain sharedInstance] getEmbeddedList] + windowContainsEmbedded: o_vout_wnd] ) { - [o_vout_wnd updateTitle]; + msg_Dbg( p_intf, "updateTitle call getVoutView" ); + [[o_vout_wnd getVoutView] updateTitle]; } } vlc_object_release( (vlc_object_t *)p_vout ); @@ -998,7 +1177,7 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf->p_sys->b_current_title_update = FALSE; } - if( p_input && [o_timeslider isEnabled] ) + if( p_intf->p_sys->p_input && [o_timeslider isEnabled] ) { /* Update the slider */ vlc_value_t time; @@ -1007,11 +1186,11 @@ static VLCMain *_o_sharedMainInstance = nil; vlc_value_t pos; float f_updated; - var_Get( p_input, "position", &pos ); + var_Get( p_intf->p_sys->p_input, "position", &pos ); f_updated = 10000. * pos.f_float; [o_timeslider setFloatValue: f_updated]; - var_Get( p_input, "time", &time ); + var_Get( p_intf->p_sys->p_input, "time", &time ); i_seconds = time.i_time / 1000000; o_time = [NSString stringWithFormat: @"%d:%02d:%02d", @@ -1019,8 +1198,10 @@ static VLCMain *_o_sharedMainInstance = nil; (int) (i_seconds / 60 % 60), (int) (i_seconds % 60)]; [o_timefield setStringValue: o_time]; + [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; + [o_embedded_window setTime: o_time position: f_updated]; } - + if( p_intf->p_sys->b_volume_update ) { NSString *o_text; @@ -1028,7 +1209,7 @@ static VLCMain *_o_sharedMainInstance = nil; o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX]; if( i_lastShownVolume != -1 ) [self setScrollField:o_text stopAfter:1000000]; - i_volume_step = config_GetInt( p_intf->p_vlc, "volume-step" ); + i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" ); [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step]; [o_volumeslider setEnabled: TRUE]; p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 ); @@ -1036,11 +1217,12 @@ static VLCMain *_o_sharedMainInstance = nil; } /* Manage Playing status */ - var_Get( p_input, "state", &val ); + var_Get( p_intf->p_sys->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]; } } else @@ -1048,10 +1230,10 @@ static VLCMain *_o_sharedMainInstance = nil; p_intf->p_sys->i_play_status = END_S; p_intf->p_sys->b_intf_update = VLC_TRUE; [self playStatusUpdated: p_intf->p_sys->i_play_status]; + [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status]; [self setSubmenusEnabled: FALSE]; } -#undef p_input [self updateMessageArray]; @@ -1109,6 +1291,12 @@ static VLCMain *_o_sharedMainInstance = nil; { vlc_object_t * p_dec_obj; + [o_controls setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)p_vout + var: "aspect-ratio" selector: @selector(toggleVar:)]; + + [o_controls setupVarMenuItem: o_mi_crop target: (vlc_object_t *) p_vout + var: "crop" selector: @selector(toggleVar:)]; + [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout var: "video-device" selector: @selector(toggleVar:)]; @@ -1145,33 +1333,26 @@ static VLCMain *_o_sharedMainInstance = nil; - (void)resetScrollField { i_end_scroll = -1; -#define p_input p_intf->p_sys->p_input - if( p_input && !p_input->b_die ) + if( p_intf->p_sys->p_input && !p_intf->p_sys->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; - } + playlist_t * p_playlist = pl_Yield( p_intf ); + o_temp = [NSString stringWithUTF8String: - p_playlist->status.p_item->input.psz_name]; + p_playlist->status.p_item->p_input->psz_name]; if( o_temp == NULL ) o_temp = [NSString stringWithCString: - p_playlist->status.p_item->input.psz_name]; + p_playlist->status.p_item->p_input->psz_name]; [self setScrollField: o_temp stopAfter:-1]; vlc_object_release( p_playlist ); return; } -#undef p_input [self setScrollField: _NS("VLC media player") stopAfter:-1]; } - (void)updateMessageArray { int i_start, i_stop; - vlc_value_t quiet; vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); i_stop = *p_intf->p_sys->p_sub->pi_stop; @@ -1225,23 +1406,6 @@ static VLCMain *_o_sharedMainInstance = nil; [o_msg_arr addObject: [o_msg_color autorelease]]; [o_msg_lock unlock]; - - var_Get( p_intf->p_vlc, "verbose", &quiet ); - - if( i_type == 1 && quiet.i_int > -1 ) - { - NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n", - p_intf->p_sys->p_sub->p_msg[i_start].psz_module, - p_intf->p_sys->p_sub->p_msg[i_start].psz_msg]; - - NSRange s_r = NSMakeRange( [[o_err_msg string] length], 0 ); - [o_err_msg setEditable: YES]; - [o_err_msg setSelectedRange: s_r]; - [o_err_msg insertText: o_my_msg]; - - [o_error makeKeyAndOrderFront: self]; - [o_err_msg setEditable: NO]; - } } vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock ); @@ -1254,19 +1418,23 @@ static VLCMain *_o_sharedMainInstance = nil; { if( i_status == PLAYING_S ) { + [[[self getControls] getFSPanel] setPause]; [o_btn_play setImage: o_img_pause]; [o_btn_play setAlternateImage: o_img_pause_pressed]; [o_btn_play setToolTip: _NS("Pause")]; [o_mi_play setTitle: _NS("Pause")]; [o_dmi_play setTitle: _NS("Pause")]; + [o_vmi_play setTitle: _NS("Pause")]; } else { + [[[self getControls] getFSPanel] setPlay]; [o_btn_play setImage: o_img_play]; [o_btn_play setAlternateImage: o_img_play_pressed]; [o_btn_play setToolTip: _NS("Play")]; [o_mi_play setTitle: _NS("Play")]; [o_dmi_play setTitle: _NS("Play")]; + [o_vmi_play setTitle: _NS("Play")]; } } @@ -1284,6 +1452,8 @@ static VLCMain *_o_sharedMainInstance = nil; [o_mi_ffmpeg_pp setEnabled: b_enabled]; [o_mi_device setEnabled: b_enabled]; [o_mi_screen setEnabled: b_enabled]; + [o_mi_aspect_ratio setEnabled: b_enabled]; + [o_mi_crop setEnabled: b_enabled]; } - (void)manageVolumeSlider @@ -1334,6 +1504,8 @@ static VLCMain *_o_sharedMainInstance = nil; (int) (i_seconds / 60 % 60), (int) (i_seconds % 60)]; [o_timefield setStringValue: o_time]; + [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time]; + [o_embedded_window setTime: o_time position: f_updated]; } #undef p_input } @@ -1352,12 +1524,9 @@ static VLCMain *_o_sharedMainInstance = nil; #undef p_input /* Stop playback */ - if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, - FIND_ANYWHERE ) ) ) - { - playlist_Stop( p_playlist ); - vlc_object_release( p_playlist ); - } + p_playlist = pl_Yield( p_intf ); + 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 @@ -1377,6 +1546,9 @@ static VLCMain *_o_sharedMainInstance = nil; { [o_extended savePrefs]; } + + p_intf->b_interaction = VLC_FALSE; + var_DelCallback( p_intf, "interaction", InteractCallback, self ); /* release some other objects here, because it isn't sure whether dealloc * will be called later on -- FK (10/6/05) */ @@ -1397,6 +1569,12 @@ static VLCMain *_o_sharedMainInstance = nil; 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_img_pause_pressed != nil ) { @@ -1454,7 +1632,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]; @@ -1466,7 +1644,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]; @@ -1478,7 +1656,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]; @@ -1490,7 +1668,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]; @@ -1502,7 +1680,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]; @@ -1520,7 +1698,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]; @@ -1536,7 +1714,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]; @@ -1549,13 +1727,13 @@ 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]; @@ -1566,7 +1744,7 @@ static VLCMain *_o_sharedMainInstance = nil; - (IBAction)viewAbout:(id)sender { - if (!nib_about_loaded) + if ( !nib_about_loaded ) { nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self]; [o_about showPanel]; @@ -1583,28 +1761,15 @@ static VLCMain *_o_sharedMainInstance = nil; [o_prefs showPrefs]; } -/*- (IBAction)checkForUpdate:(id)sender +- (IBAction)checkForUpdate:(id)sender { - if (!nib_update_loaded) + if ( !nib_update_loaded ) { nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self]; [o_update showUpdateWindow]; } else { [o_update showUpdateWindow]; } -}*/ - -- (IBAction)closeError:(id)sender -{ - vlc_value_t val; - - if( [o_err_ckbk_surpress state] == NSOnState ) - { - val.i_int = -1; - var_Set( p_intf->p_vlc, "verbose", val ); - } - [o_err_msg setString: @""]; - [o_error performClose: self]; } - (IBAction)openReadMe:(id)sender @@ -1675,11 +1840,21 @@ static VLCMain *_o_sharedMainInstance = nil; } else { - NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("You haven't experienced any heavy crashes yet.") ); + 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.") ); } } +- (IBAction)viewErrorsAndWarnings:(id)sender +{ + [[[self getInteractionList] getErrorPanel] showPanel]; +} + +- (IBAction)showMessagesPanel:(id)sender +{ + [o_msgs_panel makeKeyAndOrderFront: sender]; +} + - (void)windowDidBecomeKey:(NSNotification *)o_notification { if( [o_notification object] == o_msgs_panel )