/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.109 2003/12/22 14:45:37 hartman Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
#include "vout.h"
#include "prefs.h"
#include "playlist.h"
-#include "info.h"
#include "controls.h"
/*****************************************************************************
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
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
p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
+ p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
-
- [[VLCApplication sharedApplication] autorelease];
- [NSApp setIntf: p_intf];
-
-
- [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
return( 0 );
}
void E_(CloseIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
-
+
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-
+
[p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
-
+
free( p_intf->p_sys );
}
* fails to go to real-time priority with the first launched thread
* (???) --Meuuh */
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-
+ [[VLCMain sharedInstance] setIntf: p_intf];
+ [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
[NSApp run];
+ [[VLCMain sharedInstance] terminate];
}
-/*****************************************************************************
- * VLCApplication implementation
- *****************************************************************************/
-@implementation VLCApplication
-
-- (NSString *)localizedString:(char *)psz
-{
- NSString * o_str = nil;
-
- if( psz != NULL )
- {
- o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
- }
- if ( o_str == NULL )
- {
- msg_Err( p_intf, "could not translate: %s", psz );
- }
-
- return( o_str );
-}
-
-- (char *)delocalizeString:(NSString *)id
-{
- NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
- allowLossyConversion: NO];
- char * psz_string;
-
- if ( o_data == nil )
- {
- o_data = [id dataUsingEncoding: NSUTF8StringEncoding
- allowLossyConversion: YES];
- psz_string = malloc( [o_data length] + 1 );
- [o_data getBytes: psz_string];
- psz_string[ [o_data length] ] = '\0';
- msg_Err( p_intf, "cannot convert to wanted encoding: %s",
- psz_string );
- }
- else
- {
- psz_string = malloc( [o_data length] + 1 );
- [o_data getBytes: psz_string];
- psz_string[ [o_data length] ] = '\0';
- }
-
- return psz_string;
-}
-
-/* i_width is in pixels */
-- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width
-{
- NSMutableString *o_wrapped;
- NSString *o_out_string;
- NSRange glyphRange, effectiveRange, charRange;
- NSRect lineFragmentRect;
- unsigned glyphIndex, breaksInserted = 0;
-
- NSTextStorage *o_storage = [[NSTextStorage alloc] initWithString: o_in_string
- attributes: [NSDictionary dictionaryWithObjectsAndKeys:
- [NSFont labelFontOfSize: 0.0], NSFontAttributeName, nil]];
- NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
- NSTextContainer *o_container = [[NSTextContainer alloc]
- initWithContainerSize: NSMakeSize(i_width, 2000)];
-
- [o_layout_manager addTextContainer: o_container];
- [o_container release];
- [o_storage addLayoutManager: o_layout_manager];
- [o_layout_manager release];
-
- o_wrapped = [o_in_string mutableCopy];
- glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
-
- for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
- glyphIndex += effectiveRange.length) {
- lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
- effectiveRange: &effectiveRange];
- charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange
- actualGlyphRange: &effectiveRange];
- if ([o_wrapped lineRangeForRange:
- NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) {
- [o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted];
- breaksInserted++;
- }
- }
- o_out_string = [NSString stringWithString: o_wrapped];
- [o_wrapped release];
- [o_storage release];
-
- return o_out_string;
-}
-
-- (void)setIntf:(intf_thread_t *)_p_intf
-{
- p_intf = _p_intf;
-}
-
-- (intf_thread_t *)getIntf
-{
- return( p_intf );
-}
-
-- (void)terminate:(id)sender
-{
- p_intf->p_vlc->b_die = VLC_TRUE;
-}
-
-@end
-
int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
{
int i_ret = 0;
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
if( [target respondsToSelector: @selector(performSelectorOnMainThread:
withObject:waitUntilDone:)] )
{
[target performSelectorOnMainThread: sel
withObject: [NSValue valueWithPointer: p_arg]
- waitUntilDone: YES];
+ waitUntilDone: NO];
}
- else if( NSApp != nil && [NSApp respondsToSelector: @selector(getIntf)] )
+ else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
{
NSValue * o_v1;
NSValue * o_v2;
id * val[] = { &o_lock, &o_v2 };
- p_intf = (intf_thread_t *)[NSApp getIntf];
+ p_intf = (intf_thread_t *)VLCIntf;
o_recv_port = [[NSPort port] retain];
o_v1 = [NSValue valueWithPointer: val];
i_ret = 1;
}
- [o_pool release];
+ //[o_pool release];
return( i_ret );
}
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 = [NSApp getIntf];
- p_intf->p_sys->b_playlist_update = VLC_TRUE;
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ intf_thread_t * p_intf = VLCIntf;
+ p_intf->p_sys->b_playlist_update = TRUE;
+ p_intf->p_sys->b_intf_update = TRUE;
return VLC_SUCCESS;
}
*****************************************************************************/
@implementation VLCMain
+static VLCMain *_o_sharedMainInstance = nil;
+
++ (VLCMain *)sharedInstance
+{
+ return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+ if( _o_sharedMainInstance) {
+ [self dealloc];
+ } else {
+ _o_sharedMainInstance = [super init];
+ }
+
+ return _o_sharedMainInstance;
+}
+
+- (void)setIntf: (intf_thread_t *)p_mainintf {
+ p_intf = p_mainintf;
+}
+
+- (intf_thread_t *)getIntf {
+ return p_intf;
+}
+
- (void)awakeFromNib
{
unsigned int i_key = 0;
- intf_thread_t * p_intf = [NSApp getIntf];
+ playlist_t *p_playlist;
+ vlc_value_t val;
[self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
i_key = config_GetInt( p_intf, "key-jump-10sec" );
[o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+1min" );
+ [o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump-1min" );
+ [o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+5min" );
+ [o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump-5min" );
+ [o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-vol-up" );
[o_mi_vol_up setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_vol_up setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
[o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
+
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
+
+ p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
+ if( p_playlist )
+ {
+ /* Check if we need to start playing */
+ if( p_intf->b_play )
+ {
+ playlist_Play( p_playlist );
+ }
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+ vlc_object_release( p_playlist );
+ }
}
- (void)initStrings
{
[o_window setTitle: _NS("VLC - Controller")];
- [o_scrollfield setStringValue: _NS("VLC Media Player")];
+ [o_scrollfield setStringValue: _NS("VLC media player")];
/* button controls */
[o_btn_prev setToolTip: _NS("Previous")];
/* main menu */
[o_mi_about setTitle: _NS("About VLC media player")];
[o_mi_prefs setTitle: _NS("Preferences...")];
+ [o_mi_add_intf setTitle: _NS("Add Interface")];
+ [o_mu_add_intf setTitle: _NS("Add Interface")];
+ [o_mi_services setTitle: _NS("Services")];
[o_mi_hide setTitle: _NS("Hide VLC")];
[o_mi_hide_others setTitle: _NS("Hide Others")];
[o_mi_show_all setTitle: _NS("Show All")];
[o_mi_slower setTitle: _NS("Slower")];
[o_mi_previous setTitle: _NS("Previous")];
[o_mi_next setTitle: _NS("Next")];
- [o_mi_random setTitle: _NS("Shuffle")];
- [o_mi_repeat setTitle: _NS("Repeat Item")];
- [o_mi_loop setTitle: _NS("Repeat Playlist")];
+ [o_mi_random setTitle: _NS("Random")];
+ [o_mi_repeat setTitle: _NS("Repeat One")];
+ [o_mi_loop setTitle: _NS("Repeat All")];
[o_mi_fwd setTitle: _NS("Step Forward")];
[o_mi_bwd setTitle: _NS("Step Backward")];
+
[o_mi_program setTitle: _NS("Program")];
[o_mu_program setTitle: _NS("Program")];
[o_mi_title setTitle: _NS("Title")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mi_mute setTitle: _NS("Mute")];
- [o_mi_audiotrack setTitle: _NS("Audio track")];
- [o_mu_audiotrack setTitle: _NS("Audio track")];
- [o_mi_channels setTitle: _NS("Audio channels")];
- [o_mu_channels setTitle: _NS("Audio channels")];
- [o_mi_device setTitle: _NS("Audio device")];
- [o_mu_device setTitle: _NS("Audio device")];
+ [o_mi_audiotrack setTitle: _NS("Audio Track")];
+ [o_mu_audiotrack setTitle: _NS("Audio Track")];
+ [o_mi_channels setTitle: _NS("Audio Channels")];
+ [o_mu_channels setTitle: _NS("Audio Channels")];
+ [o_mi_device setTitle: _NS("Audio Device")];
+ [o_mu_device setTitle: _NS("Audio Device")];
[o_mi_visual setTitle: _NS("Visualizations")];
[o_mu_visual setTitle: _NS("Visualizations")];
[o_mi_half_window setTitle: _NS("Half Size")];
[o_mi_normal_window setTitle: _NS("Normal Size")];
[o_mi_double_window setTitle: _NS("Double Size")];
- [o_mi_fittoscreen setTitle: _NS("Fit To Screen")];
+ [o_mi_fittoscreen setTitle: _NS("Fit to Screen")];
[o_mi_fullscreen setTitle: _NS("Fullscreen")];
- [o_mi_floatontop setTitle: _NS("Float On Top")];
- [o_mi_videotrack setTitle: _NS("Video track")];
- [o_mu_videotrack setTitle: _NS("Video track")];
- [o_mi_screen setTitle: _NS("Video device")];
- [o_mu_screen setTitle: _NS("Video device")];
- [o_mi_subtitle setTitle: _NS("Subtitles track")];
- [o_mu_subtitle setTitle: _NS("Subtitles track")];
+ [o_mi_floatontop setTitle: _NS("Float on Top")];
+ [o_mi_videotrack setTitle: _NS("Video Track")];
+ [o_mu_videotrack setTitle: _NS("Video Track")];
+ [o_mi_screen setTitle: _NS("Video Device")];
+ [o_mu_screen setTitle: _NS("Video Device")];
+ [o_mi_subtitle setTitle: _NS("Subtitles Track")];
+ [o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
[o_dmi_stop setTitle: _NS("Stop")];
[o_dmi_next setTitle: _NS("Next")];
[o_dmi_previous setTitle: _NS("Previous")];
+ [o_dmi_mute setTitle: _NS("Mute")];
/* error panel */
[o_error setTitle: _NS("Error")];
[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")];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
o_msg_lock = [[NSLock alloc] init];
o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
[NSThread detachNewThreadSelector: @selector(manage)
toTarget: self withObject: nil];
+
+ [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
+ var: "intf-add" selector: @selector(toggleVar:)];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
}
return( TRUE );
}
+- (NSString *)localizedString:(char *)psz
+{
+ NSString * o_str = nil;
+
+ if( psz != NULL )
+ {
+ o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
+ }
+ if ( o_str == NULL )
+ {
+ msg_Err( VLCIntf, "could not translate: %s", psz );
+ }
+
+ return( o_str );
+}
+
+- (char *)delocalizeString:(NSString *)id
+{
+ NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
+ allowLossyConversion: NO];
+ char * psz_string;
+
+ if ( o_data == nil )
+ {
+ o_data = [id dataUsingEncoding: NSUTF8StringEncoding
+ allowLossyConversion: YES];
+ 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",
+ psz_string );
+ }
+ else
+ {
+ psz_string = malloc( [o_data length] + 1 );
+ [o_data getBytes: psz_string];
+ psz_string[ [o_data length] ] = '\0';
+ }
+
+ return psz_string;
+}
+
+/* i_width is in pixels */
+- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width
+{
+ NSMutableString *o_wrapped;
+ NSString *o_out_string;
+ NSRange glyphRange, effectiveRange, charRange;
+ NSRect lineFragmentRect;
+ unsigned glyphIndex, breaksInserted = 0;
+
+ NSTextStorage *o_storage = [[NSTextStorage alloc] initWithString: o_in_string
+ attributes: [NSDictionary dictionaryWithObjectsAndKeys:
+ [NSFont labelFontOfSize: 0.0], NSFontAttributeName, nil]];
+ NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
+ NSTextContainer *o_container = [[NSTextContainer alloc]
+ initWithContainerSize: NSMakeSize(i_width, 2000)];
+
+ [o_layout_manager addTextContainer: o_container];
+ [o_container release];
+ [o_storage addLayoutManager: o_layout_manager];
+ [o_layout_manager release];
+
+ o_wrapped = [o_in_string mutableCopy];
+ glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
+
+ for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
+ glyphIndex += effectiveRange.length) {
+ lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
+ effectiveRange: &effectiveRange];
+ charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange
+ actualGlyphRange: &effectiveRange];
+ if ([o_wrapped lineRangeForRange:
+ NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) {
+ [o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted];
+ breaksInserted++;
+ }
+ }
+ o_out_string = [NSString stringWithString: o_wrapped];
+ [o_wrapped release];
+ [o_storage release];
+
+ return o_out_string;
+}
+
+
+/*****************************************************************************
+ * hasDefinedShortcutKey: Check to see if the key press is a defined VLC
+ * shortcut key. If it is, pass it off to VLC for handling and return YES,
+ * otherwise ignore it and return NO (where it will get handled by Cocoa).
+ *****************************************************************************/
+- (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event
+{
+ unichar key = 0;
+ vlc_value_t val;
+ unsigned int i_pressed_modifiers = 0;
+ struct hotkey *p_hotkeys;
+ int i;
+
+ val.i_int = 0;
+ p_hotkeys = p_intf->p_vlc->p_hotkeys;
+
+ i_pressed_modifiers = [o_event modifierFlags];
+
+ if( i_pressed_modifiers & NSShiftKeyMask )
+ val.i_int |= KEY_MODIFIER_SHIFT;
+ if( i_pressed_modifiers & NSControlKeyMask )
+ val.i_int |= KEY_MODIFIER_CTRL;
+ if( i_pressed_modifiers & NSAlternateKeyMask )
+ val.i_int |= KEY_MODIFIER_ALT;
+ if( i_pressed_modifiers & NSCommandKeyMask )
+ val.i_int |= KEY_MODIFIER_COMMAND;
+
+ key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+
+ val.i_int |= CocoaKeyToVLC( key );
+
+ for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
+ {
+ if( p_hotkeys[i].i_key == val.i_int )
+ {
+ var_Set( p_intf->p_vlc, "key-pressed", val );
+ return YES;
+ }
+ }
+
+ return NO;
+}
+
- (id)getControls
{
if ( o_controls )
return nil;
}
+- (id)getInfo
+{
+ if ( o_info )
+ {
+ return o_info;
+ }
+ return nil;
+}
+
- (void)manage
{
NSDate * o_sleep_date;
- intf_thread_t * p_intf = [NSApp getIntf];
+ playlist_t * p_playlist;
+
+ /* new thread requires a new pool */
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist != NULL )
+ {
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ vlc_object_release( p_playlist );
+ }
+
while( !p_intf->b_die )
{
- playlist_t * p_playlist;
- vlc_value_t val;
vlc_mutex_lock( &p_intf->change_lock );
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist != NULL )
- {
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
-#define p_input p_playlist->p_input
+#define p_input p_intf->p_sys->p_input
+ if( p_input == NULL )
+ {
+ p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+
+ /* Refresh the interface */
if( p_input )
{
- if( !p_input->b_die )
- {
- vlc_value_t val;
-
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- p_intf->p_sys->b_playing = TRUE;
- p_intf->p_sys->b_current_title_update = 1;
- p_input->stream.b_changed = 0;
- p_intf->p_sys->b_intf_update = TRUE;
- }
-
- if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_input_update = TRUE;
- }
- }
- }
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
- {
- p_intf->p_sys->b_playing = FALSE;
+ msg_Dbg( p_intf, "input has changed, refreshing interface" );
+ p_intf->p_sys->i_play_status = PLAYING_S;
+ p_intf->p_sys->b_playing = TRUE;
+ p_intf->p_sys->b_current_title_update = 1;
p_intf->p_sys->b_intf_update = TRUE;
+ p_intf->p_sys->b_input_update = TRUE;
}
-
-#undef p_input
- vlc_object_release( p_playlist );
-
- var_Create(p_intf,"intf-change",VLC_VAR_BOOL );
- if( var_Get( p_intf, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_fullscreen_update = TRUE;
- }
- val.b_bool = VLC_FALSE;
- var_Set( p_intf,"intf-change",val);
}
+ else if( p_input->b_dead )
+ {
+ /* input stopped */
+ p_intf->p_sys->b_playing = FALSE;
+ p_intf->p_sys->b_intf_update = TRUE;
+ p_intf->p_sys->i_play_status = PAUSE_S;
+ [o_scrollfield setStringValue: _NS("VLC media player") ];
+ vlc_object_release( p_input );
+ p_input = NULL;
+ }
+#undef p_input
vlc_mutex_unlock( &p_intf->change_lock );
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
+ o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .3];
[NSThread sleepUntilDate: o_sleep_date];
}
- (void)manageIntf:(NSTimer *)o_timer
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t val;
if( p_intf->p_vlc->b_die == VLC_TRUE )
{
return;
}
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- if ( p_intf->p_sys->b_playlist_update )
- {
- [o_playlist playlistUpdated];
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
- }
-
- if( p_intf->p_sys->b_current_title_update )
- {
- vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- vlc_mutex_lock( &p_playlist->object_lock );
- [o_scrollfield setStringValue: [NSString stringWithUTF8String:
- p_playlist->pp_items[p_playlist->i_index]->psz_name]];
- vlc_mutex_unlock( &p_playlist->object_lock );
-
- 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"] )
- {
- [o_vout_wnd updateTitle];
- }
- }
- vlc_object_release( (vlc_object_t *)p_vout );
- }
- [o_playlist updateRowSelection];
- [o_info updateInfo];
-
- p_intf->p_sys->b_current_title_update = FALSE;
- }
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
-#define p_input p_playlist->p_input
-
+#define p_input p_intf->p_sys->p_input
if( p_intf->p_sys->b_intf_update )
{
vlc_bool_t b_input = VLC_FALSE;
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;
+
+ vlc_object_release( p_playlist );
if( ( b_input = ( p_input != NULL ) ) )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
/* seekable streams */
- b_seekable = p_input->stream.b_seekable;
+ var_Get( p_input, "seekable", &val);
+ b_seekable = val.b_bool;
/* check wether slow/fast motion is possible*/
- b_control = p_input->stream.b_pace_control;
+ b_control = p_input->input.b_can_pace_control;
/* chapters & titles */
- b_chapters = p_input->stream.i_area_nb > 1;
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ //b_chapters = p_input->stream.i_area_nb > 1;
}
[o_btn_stop setEnabled: b_input];
[o_timeslider setEnabled: b_seekable];
[o_timefield setStringValue: @"0:00:00"];
- [self manageVolumeSlider];
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
+
+ if ( p_intf->p_sys->b_playlist_update )
+ {
+ [o_playlist playlistUpdated];
+ p_intf->p_sys->b_playlist_update = VLC_FALSE;
+ }
+
+ if( p_intf->p_sys->b_fullscreen_update )
+ {
+ vout_thread_t * p_vout;
- if (p_intf->p_sys->b_fullscreen_update )
- {
- vout_thread_t * p_vout;
- vlc_value_t val;
- p_vout=vlc_object_find(p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE);
- if (p_vout !=NULL)
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
+
+ vlc_object_release( p_playlist );
+
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout != NULL )
{
- if( var_Get( p_intf, "fullscreen", &val )
- >= 0 && val.b_bool )
- {
- [o_btn_fullscreen setState:VLC_TRUE];
- }
- else
- {
- [o_btn_fullscreen setState:VLC_FALSE];
- }
[o_btn_fullscreen setEnabled: VLC_TRUE];
vlc_object_release( p_vout );
}
else
{
- [o_btn_fullscreen setState: VLC_FALSE];
[o_btn_fullscreen setEnabled: VLC_FALSE];
}
p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
}
- if( p_intf->p_sys->b_playing && p_input != NULL )
+ if( p_input && !p_input->b_die )
{
- vlc_value_t time;
- NSString * o_time;
- mtime_t i_seconds;
+ vlc_value_t val;
- if( p_input->stream.b_seekable )
+ if( p_intf->p_sys->b_current_title_update )
{
- vlc_value_t pos;
- float f_updated;
-
- var_Get( p_input, "position", &pos );
- f_updated = 10000. * pos.f_float;
+ 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 )
+ {
+ return;
+ }
+
+ vlc_mutex_lock( &p_playlist->object_lock );
+ o_temp = [NSString stringWithUTF8String:
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+ if( o_temp == NULL )
+ o_temp = [NSString stringWithCString:
+ p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ [o_scrollfield setStringValue: o_temp ];
+
- if( f_slider != f_updated )
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ if( p_vout != NULL )
{
- [o_timeslider setFloatValue: f_updated];
+ id o_vout_wnd;
+ NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
+
+ while( ( o_vout_wnd = [o_enum nextObject] ) )
+ {
+ if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
+ {
+ ;//[o_vout_wnd updateTitle];
+ }
+ }
+ vlc_object_release( (vlc_object_t *)p_vout );
}
+ [o_playlist updateRowSelection];
+ vlc_object_release( p_playlist );
+ p_intf->p_sys->b_current_title_update = FALSE;
}
-
- 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_timefield setStringValue: o_time];
- }
- if( p_input )
- {
- vlc_value_t val;
- var_Get( p_input, "state", &val );
- if( val.i_int != PAUSE_S )
+ if( p_intf->p_sys->b_playing && [o_timeslider isEnabled] )
{
- p_intf->p_sys->b_play_status = TRUE;
+ /* Update the slider */
+ vlc_value_t time;
+ NSString * o_time;
+ mtime_t i_seconds;
+ vlc_value_t pos;
+ float f_updated;
+
+ var_Get( p_input, "position", &pos );
+ f_updated = 10000. * pos.f_float;
+ [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_timefield setStringValue: o_time];
}
- else
+
+ /* Manage volume status */
+ [self manageVolumeSlider];
+
+ /* Manage Playing status */
+ var_Get( p_input, "state", &val );
+ if( p_intf->p_sys->i_play_status != val.i_int )
{
- p_intf->p_sys->b_play_status = FALSE;
+ p_intf->p_sys->i_play_status = val.i_int;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
}
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
}
- else
+ else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
- p_intf->p_sys->b_play_status = FALSE;
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ p_intf->p_sys->i_play_status = PAUSE_S;
+ p_intf->p_sys->b_intf_update = VLC_TRUE;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
[self setSubmenusEnabled: FALSE];
}
#undef p_input
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
-
[self updateMessageArray];
- [NSTimer scheduledTimerWithTimeInterval: 0.5
+ [NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
userInfo: nil repeats: FALSE];
}
- (void)setupMenus
{
- intf_thread_t * p_intf = [NSApp getIntf];
playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE );
- (void)updateMessageArray
{
int i_start, i_stop;
- intf_thread_t * p_intf = [NSApp getIntf];
+ 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;
[o_msg_lock unlock];
- if( i_type == 1 )
+ 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,
}
}
-- (void)playStatusUpdated:(BOOL)b_pause
+- (void)playStatusUpdated:(int)i_status
{
- if( b_pause )
+ if( i_status != PAUSE_S )
{
[o_btn_play setImage: o_img_pause];
[o_btn_play setAlternateImage: o_img_pause_pressed];
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
- intf_thread_t * p_intf = [NSApp getIntf];
aout_VolumeGet( p_intf, &i_volume );
- (IBAction)timesliderUpdate:(id)sender
{
- intf_thread_t * p_intf;
input_thread_t * p_input;
float f_updated;
return;
}
- p_intf = [NSApp getIntf];
p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
FIND_ANYWHERE );
if( p_input != NULL )
{
vlc_value_t time;
+ vlc_value_t pos;
mtime_t i_seconds;
NSString * o_time;
- if( p_input->stream.b_seekable )
- {
- vlc_value_t pos;
- pos.f_float = f_updated / 10000.;
- if( f_slider != f_updated )
- {
- var_Set( p_input, "position", pos );
- [o_timeslider setFloatValue: f_updated];
- }
- }
-
+ 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;
(int) (i_seconds / 60 % 60),
(int) (i_seconds % 60)];
[o_timefield setStringValue: o_time];
+
vlc_object_release( p_input );
}
}
- (void)terminate
{
- NSEvent * o_event;
playlist_t * p_playlist;
vout_thread_t * p_vout;
- intf_thread_t * p_intf = [NSApp getIntf];
/* Stop playback */
if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
}
/* FIXME - Wait here until all vouts are terminated because
- libvlc's VLC_Stop destroys interfaces before vouts, which isn't
+ 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 */
o_msg_lock = nil;
}
- [NSApp stop: nil];
-
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
-
- /* send a dummy event to break out of the event loop */
- o_event = [NSEvent mouseEventWithType: NSLeftMouseDown
- location: NSMakePoint( 1, 1 ) modifierFlags: 0
- timestamp: 1 windowNumber: [[NSApp mainWindow] windowNumber]
- context: [NSGraphicsContext currentContext] eventNumber: 1
- clickCount: 1 pressure: 0.0];
- [NSApp postEvent: o_event atStart: YES];
+
+ p_intf->b_die = VLC_TRUE;
+ [NSApp stop:NULL];
}
- (IBAction)clearRecentItems:(id)sender
- (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];
}
projects / vlc / blobdiff