/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.91 2003/06/30 01:51:10 hartman Exp $
+ * Copyright (C) 2002-2004 VideoLAN
+ * $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
- * Derk-Jan Hartman <thedj@users.sourceforge.net>
+ * Derk-Jan Hartman <hartman at videolan.org>
*
* 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
#include <stdlib.h> /* malloc(), free() */
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
+#include <vlc_keys.h>
#include "intf.h"
#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 initIntlSupport];
- [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
-
-- (id)init
-{
- /* default encoding: ISO-8859-1 */
- i_encoding = NSUTF8StringEncoding;
-
- return( [super init] );
-}
-
-- (void)initIntlSupport
-{
-}
-
-- (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: i_encoding
- allowLossyConversion: NO];
- char * psz_string;
-
- if ( o_data == nil )
- {
- o_data = [id dataUsingEncoding: i_encoding
- 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;
-}
-
-- (NSStringEncoding)getEncoding
-{
- return i_encoding;
-}
-
-/* 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;
}
+static struct
+{
+ unichar i_nskey;
+ unsigned int i_vlckey;
+} nskeys_to_vlckeys[] =
+{
+ { NSUpArrowFunctionKey, KEY_UP },
+ { NSDownArrowFunctionKey, KEY_DOWN },
+ { NSLeftArrowFunctionKey, KEY_LEFT },
+ { NSRightArrowFunctionKey, KEY_RIGHT },
+ { NSF1FunctionKey, KEY_F1 },
+ { NSF2FunctionKey, KEY_F2 },
+ { NSF3FunctionKey, KEY_F3 },
+ { NSF4FunctionKey, KEY_F4 },
+ { NSF5FunctionKey, KEY_F5 },
+ { NSF6FunctionKey, KEY_F6 },
+ { NSF7FunctionKey, KEY_F7 },
+ { NSF8FunctionKey, KEY_F8 },
+ { NSF9FunctionKey, KEY_F9 },
+ { NSF10FunctionKey, KEY_F10 },
+ { NSF11FunctionKey, KEY_F11 },
+ { NSF12FunctionKey, KEY_F12 },
+ { NSHomeFunctionKey, KEY_HOME },
+ { NSEndFunctionKey, KEY_END },
+ { NSPageUpFunctionKey, KEY_PAGEUP },
+ { NSPageDownFunctionKey, KEY_PAGEDOWN },
+ { NSTabCharacter, KEY_TAB },
+ { NSCarriageReturnCharacter, KEY_ENTER },
+ { NSEnterCharacter, KEY_ENTER },
+ { NSBackspaceCharacter, KEY_BACKSPACE },
+ { (unichar) ' ', KEY_SPACE },
+ { (unichar) 0x1b, KEY_ESC },
+ {0,0}
+};
+
+unichar VLCKeyToCocoa( unsigned int i_key )
+{
+ unsigned int i;
+
+ for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
+ {
+ if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
+ {
+ return nskeys_to_vlckeys[i].i_nskey;
+ }
+ }
+ return (unichar)(i_key & ~KEY_MODIFIER);
+}
+
+unsigned int CocoaKeyToVLC( unichar i_key )
+{
+ unsigned int i;
+
+ for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
+ {
+ if( nskeys_to_vlckeys[i].i_nskey == i_key )
+ {
+ return nskeys_to_vlckeys[i].i_vlckey;
+ }
+ }
+ return (unsigned int)i_key;
+}
+
+unsigned int VLCModifiersToCocoa( unsigned int i_key )
+{
+ unsigned int new = 0;
+ if( i_key & KEY_MODIFIER_COMMAND )
+ new |= NSCommandKeyMask;
+ if( i_key & KEY_MODIFIER_ALT )
+ new |= NSAlternateKeyMask;
+ if( i_key & KEY_MODIFIER_SHIFT )
+ new |= NSShiftKeyMask;
+ if( i_key & KEY_MODIFIER_CTRL )
+ new |= NSControlKeyMask;
+ return new;
+}
+
/*****************************************************************************
* VLCMain implementation
*****************************************************************************/
@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
{
- [o_window setTitle: _NS("VLC - Controller")];
+ unsigned int i_key = 0;
+ playlist_t *p_playlist;
+ vlc_value_t val;
+
+ [self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
+ [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
+ [o_msgs_panel setDelegate: self];
+
+ i_key = config_GetInt( p_intf, "key-quit" );
+ [o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-play-pause" );
+ [o_mi_play setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_play setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-stop" );
+ [o_mi_stop setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_stop setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-faster" );
+ [o_mi_faster setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_faster setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-slower" );
+ [o_mi_slower setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_slower setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-prev" );
+ [o_mi_previous setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_previous setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-next" );
+ [o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-jump+10sec" );
+ [o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ 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)];
+ i_key = config_GetInt( p_intf, "key-vol-down" );
+ [o_mi_vol_down setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_vol_down setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-vol-mute" );
+ [o_mi_mute setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_mute setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-fullscreen" );
+ [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")];
/* button controls */
- [o_btn_playlist setToolTip: _NS("Playlist")];
[o_btn_prev setToolTip: _NS("Previous")];
- [o_btn_slower setToolTip: _NS("Slower")];
+ [o_btn_rewind setToolTip: _NS("Rewind")];
[o_btn_play setToolTip: _NS("Play")];
[o_btn_stop setToolTip: _NS("Stop")];
- [o_btn_faster setToolTip: _NS("Faster")];
+ [o_btn_ff setToolTip: _NS("Fast Forward")];
[o_btn_next setToolTip: _NS("Next")];
- [o_btn_prefs setToolTip: _NS("Preferences")];
+ [o_btn_fullscreen setToolTip: _NS("Fullscreen")];
[o_volumeslider setToolTip: _NS("Volume")];
[o_timeslider setToolTip: _NS("Position")];
/* messages panel */
- [o_msgs_panel setDelegate: self];
[o_msgs_panel setTitle: _NS("Messages")];
- [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
/* 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_quit setTitle: _NS("Quit VLC")];
[o_mu_file setTitle: _ANS("1:File")];
- [o_mi_open_generic setTitle: _NS("Open...")];
- [o_mi_open_file setTitle: _NS("Open File...")];
+ [o_mi_open_generic setTitle: _NS("Open File...")];
+ [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_recent setTitle: _NS("Open Recent")];
[o_mi_slower setTitle: _NS("Slower")];
[o_mi_previous setTitle: _NS("Previous")];
[o_mi_next setTitle: _NS("Next")];
- [o_mi_loop setTitle: _NS("Loop")];
+ [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_mu_video setTitle: _NS("Video")];
[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")];
-
- [self setSubmenusEnabled: FALSE];
- [self manageVolumeSlider];
}
- (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];
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]
[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 );
}
- (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- config_PutPsz( p_intf, "sub-file", "" );
- config_PutInt( p_intf, "sub-delay", 0 );
- config_PutFloat( p_intf, "sub-fps", 0.0 );
- config_PutPsz( p_intf, "sout", "" );
-
+ NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
[o_playlist appendArray:
- [NSArray arrayWithObject: o_filename] atPos: -1 enqueue: NO];
+ [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
return( TRUE );
}
-- (id)getControls
+- (NSString *)localizedString:(char *)psz
{
- if ( o_controls )
+ NSString * o_str = nil;
+
+ if( psz != NULL )
{
- return o_controls;
+ o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
}
- return nil;
+ if ( o_str == NULL )
+ {
+ msg_Err( VLCIntf, "could not translate: %s", psz );
+ }
+
+ return( o_str );
}
-- (void)manage
+- (char *)delocalizeString:(NSString *)id
{
- NSDate * o_sleep_date;
- intf_thread_t * p_intf = [NSApp getIntf];
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
- vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
+ allowLossyConversion: NO];
+ char * psz_string;
- while( !p_intf->b_die )
+ 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
{
- playlist_t * p_playlist;
+ psz_string = malloc( [o_data length] + 1 );
+ [o_data getBytes: psz_string];
+ psz_string[ [o_data length] ] = '\0';
+ }
- vlc_mutex_lock( &p_intf->change_lock );
+ return psz_string;
+}
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+/* 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;
- if( p_playlist != NULL )
- {
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- vlc_mutex_lock( &p_playlist->object_lock );
-
- [self manage: p_playlist];
-
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ 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++;
}
-
- vlc_mutex_unlock( &p_intf->change_lock );
-
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
- [NSThread sleepUntilDate: o_sleep_date];
}
-
- [self terminate];
-
- [o_pool release];
+ o_out_string = [NSString stringWithString: o_wrapped];
+ [o_wrapped release];
+ [o_storage release];
+
+ return o_out_string;
}
-- (void)manage:(playlist_t *)p_playlist
+
+/*****************************************************************************
+ * 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
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ unichar key = 0;
+ vlc_value_t val;
+ unsigned int i_pressed_modifiers = 0;
+ struct hotkey *p_hotkeys;
+ int i;
-#define p_input p_playlist->p_input
+ val.i_int = 0;
+ p_hotkeys = p_intf->p_vlc->p_hotkeys;
- if( p_input )
- {
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ i_pressed_modifiers = [o_event modifierFlags];
- if( !p_input->b_die )
- {
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- p_intf->p_sys->b_playing = TRUE;
- [self manageMode: p_playlist];
- }
+ 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;
- vlc_value_t val;
+ key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
- if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_input_update = TRUE;
- }
- }
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
+ val.i_int |= CocoaKeyToVLC( key );
+
+ for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
- p_intf->p_sys->b_playing = FALSE;
- [self manageMode: p_playlist];
+ if( p_hotkeys[i].i_key == val.i_int )
+ {
+ var_Set( p_intf->p_vlc, "key-pressed", val );
+ return YES;
+ }
}
-#undef p_input
+ return NO;
}
-- (void)manageMode:(playlist_t *)p_playlist
+- (id)getControls
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- if( p_playlist->p_input != NULL )
+ if ( o_controls )
{
- p_intf->p_sys->b_current_title_update = 1;
- p_playlist->p_input->stream.b_changed = 0;
-
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
+ return o_controls;
}
- else
- {
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout != NULL )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
+ return nil;
+}
- vlc_mutex_unlock( &p_playlist->object_lock );
- vout_Destroy( p_vout );
- vlc_mutex_lock( &p_playlist->object_lock );
- }
+- (id)getPlaylist
+{
+ if ( o_playlist )
+ {
+ return o_playlist;
}
-
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ return nil;
}
-- (void)manageIntf:(NSTimer *)o_timer
+- (id)getInfo
{
- intf_thread_t * p_intf = [NSApp getIntf];
-
- if( p_intf->p_vlc->b_die == VLC_TRUE )
+ if ( o_info )
{
- [o_timer invalidate];
- return;
+ return o_info;
}
+ return nil;
+}
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+- (void)manage
+{
+ NSDate * o_sleep_date;
+ playlist_t * p_playlist;
+
+ /* new thread requires a new pool */
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- if( p_playlist == NULL )
- {
- return;
- }
+ vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
- if ( p_intf->p_sys->b_playlist_update )
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist != NULL )
{
- [o_playlist playlistUpdated];
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
+ 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 );
}
- if( p_intf->p_sys->b_current_title_update )
+ while( !p_intf->b_die )
{
- vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout != NULL )
+ vlc_mutex_lock( &p_intf->change_lock );
+
+#define p_input p_intf->p_sys->p_input
+
+ if( p_input == NULL )
{
- /* We need to lock the vout here to make sure it does not disappear */
- id o_vout_wnd;
- NSEnumerator * o_enum = [[NSApp windows] objectEnumerator];
+ p_input = (input_thread_t *)vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
- while( ( o_vout_wnd = [o_enum nextObject] ) )
+ /* Refresh the interface */
+ if( p_input )
{
- if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
- {
- [o_vout_wnd updateTitle];
- }
+ 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;
}
- vlc_object_release( (vlc_object_t *)p_vout );
}
- [o_playlist updateRowSelection];
- [o_info updateInfo];
+ 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
- p_intf->p_sys->b_current_title_update = FALSE;
+ vlc_mutex_unlock( &p_intf->change_lock );
+
+ o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .3];
+ [NSThread sleepUntilDate: o_sleep_date];
}
- vlc_mutex_lock( &p_playlist->object_lock );
+ [self terminate];
+ [o_pool release];
+}
-#define p_input p_playlist->p_input
+- (void)manageIntf:(NSTimer *)o_timer
+{
+ vlc_value_t val;
- if( p_input != NULL )
+ if( p_intf->p_vlc->b_die == VLC_TRUE )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ [o_timer invalidate];
+ return;
}
+#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 ) ) )
{
/* seekable streams */
- b_seekable = p_input->stream.b_seekable;
+ var_Get( p_input, "seekable", &val);
+ b_seekable = val.b_bool;
- /* control buttons for free pace streams */
- b_control = p_input->stream.b_pace_control;
+ /* check wether slow/fast motion is possible*/
+ b_control = p_input->input.b_can_pace_control;
/* chapters & titles */
- b_chapters = p_input->stream.i_area_nb > 1;
-
- /* play status */
- p_intf->p_sys->b_play_status =
- p_input->stream.control.i_status != PAUSE_S;
- }
- else
- {
- /* play status */
- p_intf->p_sys->b_play_status = FALSE;
- [self setSubmenusEnabled: FALSE];
+ //b_chapters = p_input->stream.i_area_nb > 1;
}
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
-
[o_btn_stop setEnabled: b_input];
- [o_btn_faster setEnabled: b_control];
- [o_btn_slower setEnabled: b_control];
+ [o_btn_ff setEnabled: b_seekable];
+ [o_btn_rewind setEnabled: b_seekable];
[o_btn_prev setEnabled: (b_plmul || b_chapters)];
[o_btn_next setEnabled: (b_plmul || b_chapters)];
[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;
-#define p_area p_input->stream.p_selected_area
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- if( p_intf->p_sys->b_playing && p_input != NULL )
- {
- vlc_bool_t b_field_update = TRUE;
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
- if( !p_input->b_die && ( p_intf->p_sys->b_play_status !=
- ( p_input->stream.control.i_status != PAUSE_S ) ) )
- {
- p_intf->p_sys->b_play_status =
- !p_intf->p_sys->b_play_status;
+ vlc_object_release( p_playlist );
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
+ if( p_vout != NULL )
+ {
+ [o_btn_fullscreen setEnabled: VLC_TRUE];
+ vlc_object_release( p_vout );
+ }
+ else
+ {
+ [o_btn_fullscreen setEnabled: VLC_FALSE];
}
+ p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
+ }
+
+ if( p_input && !p_input->b_die )
+ {
+ vlc_value_t val;
- if( p_input->stream.b_seekable )
+ if( p_intf->p_sys->b_current_title_update )
{
- if( f_slider == f_slider_old )
- {
- float f_updated = ( 10000. * p_area->i_tell ) /
- p_area->i_size;
+ NSString *o_temp;
+ vout_thread_t *p_vout;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- if( f_slider != f_updated )
- {
- [o_timeslider setFloatValue: f_updated];
- }
- }
- else
+ if( p_playlist == NULL )
{
- off_t i_seek = ( f_slider * p_area->i_size ) / 10000;
+ return;
+ }
- /* release the lock to be able to seek */
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- input_Seek( p_input, i_seek, INPUT_SEEK_SET );
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ 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 ];
- /* update the old value */
- f_slider_old = f_slider;
- b_field_update = VLC_FALSE;
+ p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+ 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];
+ vlc_object_release( p_playlist );
+ p_intf->p_sys->b_current_title_update = FALSE;
}
- if( b_field_update )
+ if( p_intf->p_sys->b_playing && [o_timeslider isEnabled] )
{
+ /* Update the slider */
+ vlc_value_t time;
NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
-
- input_OffsetToTime( p_input, psz_time, p_area->i_tell );
-
- o_time = [NSString stringWithUTF8String: psz_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];
}
-
- /* disable screen saver */
- UpdateSystemActivity( UsrActivity );
+
+ /* 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->i_play_status = val.i_int;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
+ }
}
-
-#undef p_area
-
- if( p_input != NULL )
+ else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ 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 );
[o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
var: "audio-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
+ var: "visual" selector: @selector(toggleVar:)];
vlc_object_release( (vlc_object_t *)p_aout );
}
- (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];
[o_btn_play setToolTip: _NS("Pause")];
[o_mi_play setTitle: _NS("Pause")];
[o_dmi_play setTitle: _NS("Pause")];
else
{
[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_mi_title setEnabled: b_enabled];
[o_mi_chapter setEnabled: b_enabled];
[o_mi_audiotrack setEnabled: b_enabled];
+ [o_mi_visual setEnabled: b_enabled];
[o_mi_videotrack setEnabled: b_enabled];
[o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled];
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
- intf_thread_t * p_intf = [NSApp getIntf];
aout_VolumeGet( p_intf, &i_volume );
- (IBAction)timesliderUpdate:(id)sender
{
+ input_thread_t * p_input;
float f_updated;
switch( [[NSApp currentEvent] type] )
{
case NSLeftMouseUp:
case NSLeftMouseDown:
- f_slider = [sender floatValue];
- return;
-
case NSLeftMouseDragged:
f_updated = [sender floatValue];
break;
return;
}
- intf_thread_t * p_intf = [NSApp getIntf];
-
- 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 );
+ p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
- if( p_playlist->p_input != NULL )
+ if( p_input != NULL )
{
- off_t i_tell;
+ vlc_value_t time;
+ vlc_value_t pos;
+ mtime_t i_seconds;
NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
-#define p_area p_playlist->p_input->stream.p_selected_area
- vlc_mutex_lock( &p_playlist->p_input->stream.stream_lock );
- i_tell = f_updated / 10000. * p_area->i_size;
- input_OffsetToTime( p_playlist->p_input, psz_time, i_tell );
- vlc_mutex_unlock( &p_playlist->p_input->stream.stream_lock );
-#undef p_area
+ pos.f_float = f_updated / 10000.;
+ var_Set( p_input, "position", pos );
+ [o_timeslider setFloatValue: f_updated];
- o_time = [NSString stringWithUTF8String: psz_time];
- [o_timefield setStringValue: o_time];
- }
+ 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];
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ vlc_object_release( p_input );
+ }
}
- (void)terminate
{
- NSEvent * o_event;
- vout_thread_t * p_vout;
playlist_t * p_playlist;
- intf_thread_t * p_intf = [NSApp getIntf];
-
- /*
- * Free playlists
- */
- msg_Dbg( p_intf, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
+ vout_thread_t * p_vout;
+
+ /* Stop playback */
+ if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE ) ) )
{
- vlc_object_detach( p_playlist );
+ playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
}
- /*
- * Free video outputs
- */
- msg_Dbg( p_intf, "removing all video outputs" );
- while( (p_vout = vlc_object_find( p_intf->p_vlc,
- VLC_OBJECT_VOUT, FIND_CHILD )) )
+ /* FIXME - Wait here until all vouts are terminated because
+ libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't
+ good on OS X. We definitly need a cleaner way to handle this,
+ but this may hopefully be good enough for now.
+ -- titer 2003/11/22 */
+ while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE ) ) )
{
- vlc_object_detach( p_vout );
vlc_object_release( p_vout );
- vout_Destroy( p_vout );
+ msleep( 100000 );
}
+ msleep( 500000 );
+ if( o_img_pause_pressed != nil )
+ {
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
+ }
+
+ if( o_img_pause_pressed != nil )
+ {
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
+ }
+
if( o_img_pause != nil )
{
[o_img_pause release];
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];
}
- (IBAction)openWebsite:(id)sender
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"];
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
}