/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.37 2003/01/28 01:50:52 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 <QuickTime/QuickTime.h>
+#include <vlc_keys.h>
#include "intf.h"
#include "vout.h"
#include "prefs.h"
#include "playlist.h"
+#include "info.h"
+#include "controls.h"
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
-static void Run ( intf_thread_t *p_intf );
+static void Run ( intf_thread_t *p_intf );
/*****************************************************************************
* OpenIntf: initialize interface
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
-
+
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
- p_intf->p_sys->o_sendport = [[NSPort port] retain];
+ /* Put Cocoa into multithread mode as soon as possible.
+ * http://developer.apple.com/techpubs/macosx/Cocoa/
+ * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
+ * This thread does absolutely nothing at all. */
+ [NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
+
+ p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-
+ p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
-
- [[VLCApplication sharedApplication] autorelease];
- [NSApp initIntlSupport];
+
+ [VLCApplication sharedApplication];
[NSApp setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
- config_SaveConfigFile( p_intf, MODULE_STRING );
-
[p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
*****************************************************************************/
@implementation VLCApplication
-- (id)init
-{
- /* default encoding: ISO-8859-1 */
- i_encoding = NSISOLatin1StringEncoding;
-
- return( [super init] );
-}
-
-- (void)initIntlSupport
+- (NSString *)localizedString:(char *)psz
{
- char *psz_lang = getenv( "LANG" );
+ NSString * o_str = nil;
- if( psz_lang == NULL )
+ if( psz != NULL )
{
- return;
+ o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
}
-
- if( strncmp( psz_lang, "pl", 2 ) == 0 )
+ if ( o_str == NULL )
{
- i_encoding = NSISOLatin2StringEncoding;
+ msg_Err( p_intf, "could not translate: %s", psz );
}
- else if( strncmp( psz_lang, "ja", 2 ) == 0 )
+
+ return( o_str );
+}
+
+- (char *)delocalizeString:(NSString *)id
+{
+ NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
+ allowLossyConversion: NO];
+ char * psz_string;
+
+ if ( o_data == nil )
{
- i_encoding = NSJapaneseEUCStringEncoding;
+ 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 if( strncmp( psz_lang, "ru", 2 ) == 0 )
+ else
{
-#define CFSENC2NSSENC(e) CFStringConvertEncodingToNSStringEncoding(e)
- i_encoding = CFSENC2NSSENC( kCFStringEncodingKOI8_R );
-#undef CFSENC2NSSENC
+ psz_string = malloc( [o_data length] + 1 );
+ [o_data getBytes: psz_string];
+ psz_string[ [o_data length] ] = '\0';
}
+
+ return psz_string;
}
-- (NSString *)localizedString:(char *)psz
+/* i_width is in pixels */
+- (NSString *)wrapString: (NSString *)o_in_string toWidth: (int) i_width
{
- if ( psz == NULL ) return NULL;
- UInt32 uiLength = (UInt32)strlen( psz );
- NSData * o_data = [NSData dataWithBytes: psz length: uiLength];
- NSString *o_str = [[NSString alloc] initWithData: o_data
- encoding: i_encoding];
- return( [o_str autorelease] );
+ 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
- (void)terminate:(id)sender
{
- [self getIntf]->p_vlc->b_die = VLC_TRUE;
+ p_intf->p_vlc->b_die = VLC_TRUE;
+ [super terminate:sender];
+}
+
+
+/*****************************************************************************
+ * 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;
}
@end
+int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
+{
+ int i_ret = 0;
+
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+
+ if( [target respondsToSelector: @selector(performSelectorOnMainThread:
+ withObject:waitUntilDone:)] )
+ {
+ [target performSelectorOnMainThread: sel
+ withObject: [NSValue valueWithPointer: p_arg]
+ waitUntilDone: YES];
+ }
+ else if( NSApp != nil && [NSApp respondsToSelector: @selector(getIntf)] )
+ {
+ NSValue * o_v1;
+ NSValue * o_v2;
+ NSArray * o_array;
+ NSPort * o_recv_port;
+ NSInvocation * o_inv;
+ NSPortMessage * o_msg;
+ intf_thread_t * p_intf;
+ NSConditionLock * o_lock;
+ NSMethodSignature * o_sig;
+
+ id * val[] = { &o_lock, &o_v2 };
+
+ p_intf = (intf_thread_t *)[NSApp getIntf];
+
+ o_recv_port = [[NSPort port] retain];
+ o_v1 = [NSValue valueWithPointer: val];
+ o_v2 = [NSValue valueWithPointer: p_arg];
+
+ o_sig = [target methodSignatureForSelector: sel];
+ o_inv = [NSInvocation invocationWithMethodSignature: o_sig];
+ [o_inv setArgument: &o_v1 atIndex: 2];
+ [o_inv setTarget: target];
+ [o_inv setSelector: sel];
+
+ o_array = [NSArray arrayWithObject:
+ [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]];
+ o_msg = [[NSPortMessage alloc]
+ initWithSendPort: p_intf->p_sys->o_sendport
+ receivePort: o_recv_port components: o_array];
+
+ o_lock = [[NSConditionLock alloc] initWithCondition: 0];
+ [o_msg sendBeforeDate: [NSDate distantPast]];
+ [o_lock lockWhenCondition: 1];
+ [o_lock unlock];
+ [o_lock release];
+
+ [o_msg release];
+ [o_recv_port release];
+ }
+ else
+ {
+ i_ret = 1;
+ }
+
+ [o_pool release];
+
+ return( i_ret );
+}
+
/*****************************************************************************
- * VLCMain implementation
+ * playlistChanged: Callback triggered by the intf-change playlist
+ * variable, to let the intf update the playlist.
*****************************************************************************/
-@implementation VLCMain
+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 = TRUE;
+ p_intf->p_sys->b_intf_update = TRUE;
+ return VLC_SUCCESS;
+}
-- (id)init
+static struct
{
- self = [super init];
+ 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);
+}
- if( self != nil )
+unsigned int CocoaKeyToVLC( unichar i_key )
+{
+ unsigned int i;
+
+ for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
{
- o_prefs = nil;
+ if( nskeys_to_vlckeys[i].i_nskey == i_key )
+ {
+ return nskeys_to_vlckeys[i].i_vlckey;
+ }
}
+ return (unsigned int)i_key;
+}
- return( self );
+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
+
- (void)awakeFromNib
{
- [o_window setTitle: _NS("VLC - Controller")];
+ 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];
+ [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_slowmotion setToolTip: _NS("Slowmotion")];
+ [o_btn_rewind setToolTip: _NS("Rewind")];
[o_btn_play setToolTip: _NS("Play")];
[o_btn_stop setToolTip: _NS("Stop")];
- [o_btn_fastforward setToolTip: _NS("Fast Forward")];
- [o_btn_fastforward setPeriodicDelay: 0.0 interval: 1];
+ [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_ok setTitle: _NS("Close")];
+ [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_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: _NS("File")];
- [o_mi_open_generic setTitle: _NS("Open...")];
- [o_mi_open_file setTitle: _NS("Open File...")];
+ [o_mu_file setTitle: _ANS("1: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_mu_title setTitle: _NS("Title")];
[o_mi_chapter setTitle: _NS("Chapter")];
- [o_mi_language setTitle: _NS("Language")];
- [o_mi_subtitle setTitle: _NS("Subtitles")];
+ [o_mu_chapter setTitle: _NS("Chapter")];
[o_mu_audio setTitle: _NS("Audio")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mi_mute setTitle: _NS("Mute")];
- [o_mi_channels setTitle: _NS("Channels")];
- [o_mi_device setTitle: _NS("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_fullscreen setTitle: _NS("Fullscreen")];
- [o_mi_screen setTitle: _NS("Screen")];
+ [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_mu_window setTitle: _NS("Window")];
[o_mi_minimize setTitle: _NS("Minimize Window")];
[o_mi_close_window setTitle: _NS("Close Window")];
[o_mi_controller setTitle: _NS("Controller")];
[o_mi_playlist setTitle: _NS("Playlist")];
+ [o_mi_info setTitle: _NS("Info")];
[o_mi_messages setTitle: _NS("Messages")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
[o_mu_help setTitle: _NS("Help")];
[o_mi_readme setTitle: _NS("ReadMe...")];
- [o_mi_reportabug setTitle: _NS("Report A Bug")];
+ [o_mi_documentation setTitle: _NS("Online Documentation")];
+ [o_mi_reportabug setTitle: _NS("Report a Bug")];
[o_mi_website setTitle: _NS("VideoLAN Website")];
[o_mi_license setTitle: _NS("License")];
/* dock menu */
[o_dmi_play setTitle: _NS("Play")];
[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_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_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")];
- [self manageMode];
+ [o_info_window setTitle: _NS("Info")];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
{
intf_thread_t * p_intf = [NSApp getIntf];
- f_slider_old = f_slider = 0.0;
-
o_msg_lock = [[NSLock alloc] init];
o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
- [NSThread detachNewThreadSelector: @selector(manage)
- toTarget: self withObject: nil];
+ o_img_play = [[NSImage imageNamed: @"play"] retain];
+ o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain];
+ o_img_pause = [[NSImage imageNamed: @"pause"] retain];
+ o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
[[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
forMode: NSDefaultRunLoopMode];
+
+ [NSTimer scheduledTimerWithTimeInterval: 0.5
+ target: self selector: @selector(manageIntf:)
+ userInfo: nil repeats: FALSE];
+
+ [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
{
+ 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
+{
+ if ( o_controls )
+ {
+ return o_controls;
+ }
+ return nil;
+}
+
+- (id)getPlaylist
+{
+ if ( o_playlist )
+ {
+ return o_playlist;
+ }
+ 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];
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+
while( !p_intf->b_die )
{
- int i_start, i_stop;
-
+ playlist_t * p_playlist;
+ vlc_value_t val;
vlc_mutex_lock( &p_intf->change_lock );
- /* update the input */
- if( p_intf->p_sys->p_input == NULL )
- {
- p_intf->p_sys->p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
- [self setControlItems];
- }
- else if( p_intf->p_sys->p_input->b_dead )
- {
- vlc_object_release( p_intf->p_sys->p_input );
- p_intf->p_sys->p_input = NULL;
-
- if( p_intf->p_sys->b_stopping )
- {
- 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 );
- vout_Destroy( p_vout );
- }
-
- p_intf->p_sys->b_stopping = 0;
- [self setControlItems];
- }
-
- [self displayTime];
- [self manageMode];
- }
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- if( p_intf->p_sys->p_input != NULL && !p_intf->p_sys->p_input->b_die )
+ if( p_playlist != NULL )
{
- vlc_bool_t b_need_menus = 0;
- input_thread_t * p_input = p_intf->p_sys->p_input;
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- /* Disable screen saver. */
- UpdateSystemActivity( UsrActivity );
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- [self displayTime];
-
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- [self manageMode];
- b_need_menus = 1;
- p_intf->p_sys->b_playing = 1;
- }
-
- if( p_intf->p_sys->i_part !=
- p_input->stream.p_selected_area->i_part )
- {
- p_intf->p_sys->b_chapter_update = 1;
- b_need_menus = 1;
- }
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
- if ( p_aout != NULL )
+#define p_input p_playlist->p_input
+
+ if( p_input )
{
- vlc_value_t val;
- if ( var_Get( (vlc_object_t *)p_aout, "intf-change", &val )
- >= 0 && val.b_bool )
+ if( !p_input->b_die )
{
- p_intf->p_sys->b_aout_update = 1;
- b_need_menus = 1;
+ 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;
+ }
}
- vlc_object_release( (vlc_object_t *)p_aout );
}
-
- if ( p_vout != NULL )
+ else if( p_intf->p_sys->b_playing && !p_intf->b_die )
{
- vlc_value_t val;
- if ( var_Get( (vlc_object_t *)p_vout, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_vout_update = 1;
- b_need_menus = 1;
- }
- vlc_object_release( (vlc_object_t *)p_vout );
+ p_intf->p_sys->b_playing = FALSE;
}
-
- if ( b_need_menus )
- [self setupMenus];
- [self setControlItems];
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- }
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
- {
- [self displayTime];
- [self manageMode];
- p_intf->p_sys->b_playing = 0;
- }
-
- /* update the log window */
- vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
- i_stop = *p_intf->p_sys->p_sub->pi_stop;
- vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
+#undef p_input
+ vlc_object_release( p_playlist );
- if( p_intf->p_sys->p_sub->i_start != i_stop )
- {
- NSColor *o_white = [NSColor whiteColor];
- NSColor *o_red = [NSColor redColor];
- NSColor *o_yellow = [NSColor yellowColor];
- NSColor *o_gray = [NSColor grayColor];
-
- NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray };
- static const char * ppsz_type[4] = { ": ", " error: ",
- " warning: ", " debug: " };
-
- for( i_start = p_intf->p_sys->p_sub->i_start;
- i_start != i_stop;
- i_start = (i_start+1) % VLC_MSG_QSIZE )
+ if( var_Get( p_intf, "intf-change", &val )
+ >= 0 && val.b_bool )
{
- NSString *o_msg;
- NSDictionary *o_attr;
- NSAttributedString *o_msg_color;
-
- int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type;
-
- [o_msg_lock lock];
-
- if( [o_msg_arr count] + 2 > 200 )
- {
- unsigned rid[] = { 0, 1 };
- [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid
- numIndices: sizeof(rid)/sizeof(rid[0])];
- }
-
- o_attr = [NSDictionary dictionaryWithObject: o_gray
- forKey: NSForegroundColorAttributeName];
- o_msg = [NSString stringWithFormat: @"%s%s",
- p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
- ppsz_type[i_type]];
- o_msg_color = [[NSAttributedString alloc]
- initWithString: o_msg attributes: o_attr];
- [o_msg_arr addObject: [o_msg_color autorelease]];
-
- o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type]
- forKey: NSForegroundColorAttributeName];
- o_msg = [NSString stringWithFormat: @"%s\n",
- p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
- o_msg_color = [[NSAttributedString alloc]
- initWithString: o_msg attributes: o_attr];
- [o_msg_arr addObject: [o_msg_color autorelease]];
-
- [o_msg_lock unlock];
-
- if ( i_type == 1 )
- {
- /* Error panel */
- 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];
-
- [o_err_msg setEditable: YES];
- [o_err_msg setSelectedRange:
- NSMakeRange( [[o_err_msg string] length], 0 )];
- [o_err_msg insertText: o_my_msg];
-
- [o_error makeKeyAndOrderFront: self];
- [o_err_msg setEditable: NO];
- }
+ p_intf->p_sys->b_fullscreen_update = TRUE;
}
-
- vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
- p_intf->p_sys->p_sub->i_start = i_start;
- vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
+ val.b_bool = VLC_FALSE;
+ var_Set( p_intf,"intf-change",val);
}
vlc_mutex_unlock( &p_intf->change_lock );
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: 0.1];
+ o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
[NSThread sleepUntilDate: o_sleep_date];
}
[self terminate];
-
[o_pool release];
}
-- (void)terminate
+- (void)manageIntf:(NSTimer *)o_timer
{
- NSEvent * pEvent;
- vout_thread_t * p_vout;
- playlist_t * p_playlist;
intf_thread_t * p_intf = [NSApp getIntf];
- /* release input */
- if( p_intf->p_sys->p_input )
+ if( p_intf->p_vlc->b_die == VLC_TRUE )
{
- vlc_object_release( p_intf->p_sys->p_input );
- p_intf->p_sys->p_input = NULL;
+ [o_timer invalidate];
+ return;
}
- /*
- * Free playlists
- */
- msg_Dbg( p_intf, "removing all playlists" );
- while( (p_playlist = vlc_object_find( p_intf->p_vlc, VLC_OBJECT_PLAYLIST,
- FIND_CHILD )) )
- {
- vlc_object_detach( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
- }
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
- /*
- * 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 )) )
+ if( p_playlist == NULL )
{
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_Destroy( p_vout );
+ return;
}
- if( o_msg_arr != nil )
+ if ( p_intf->p_sys->b_playlist_update )
{
- [o_msg_arr removeAllObjects];
- [o_msg_arr release];
- o_msg_arr = nil;
+ [o_playlist playlistUpdated];
+ p_intf->p_sys->b_playlist_update = VLC_FALSE;
}
- if( o_msg_lock != nil )
+ if( p_intf->p_sys->b_current_title_update )
{
- [o_msg_lock release];
- o_msg_lock = nil;
+ 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]->input.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;
}
- if( o_prefs != nil )
+ vlc_mutex_lock( &p_playlist->object_lock );
+
+#define p_input p_playlist->p_input
+
+ if( p_intf->p_sys->b_intf_update )
{
- [o_prefs release];
- o_prefs = nil;
- }
+ vlc_bool_t b_input = VLC_FALSE;
+ vlc_bool_t b_plmul = VLC_FALSE;
+ vlc_bool_t b_control = VLC_FALSE;
+ vlc_bool_t b_seekable = VLC_FALSE;
+ vlc_bool_t b_chapters = VLC_FALSE;
- [NSApp stop: nil];
+ b_plmul = p_playlist->i_size > 1;
- /* write cached user defaults to disk */
- [[NSUserDefaults standardUserDefaults] synchronize];
+ if( ( b_input = ( p_input != NULL ) ) )
+ {
+ vlc_mutex_lock( &p_input->stream.stream_lock );
- /* send a dummy event to break out of the event loop */
- pEvent = [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: pEvent atStart: YES];
-}
+ /* seekable streams */
+ b_seekable = p_input->stream.b_seekable;
-- (void)manageMode
-{
- vlc_bool_t b_input;
- vlc_bool_t b_control = 0;
- intf_thread_t * p_intf = [NSApp getIntf];
+ /* check wether slow/fast motion is possible*/
+ b_control = p_input->stream.b_pace_control;
- if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) )
- {
- /* control buttons for free pace streams */
- b_control = p_intf->p_sys->p_input->stream.b_pace_control;
-
- /* get ready for menu regeneration */
- p_intf->p_sys->b_program_update = 1;
- p_intf->p_sys->b_title_update = 1;
- p_intf->p_sys->b_chapter_update = 1;
- p_intf->p_sys->b_audio_update = 1;
- p_intf->p_sys->b_spu_update = 1;
- p_intf->p_sys->i_part = 0;
-
- p_intf->p_sys->p_input->stream.b_changed = 0;
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- }
- else
- {
- /* unsensitize menus */
- [o_mi_program setEnabled: FALSE];
- [o_mi_title setEnabled: FALSE];
- [o_mi_chapter setEnabled: FALSE];
- [o_mi_language setEnabled: FALSE];
- [o_mi_subtitle setEnabled: FALSE];
- [o_mi_channels setEnabled: FALSE];
- [o_mi_device setEnabled: FALSE];
- [o_mi_screen setEnabled: FALSE];
- [o_mi_close_window setEnabled: FALSE];
+ /* chapters & titles */
+ b_chapters = p_input->stream.i_area_nb > 1;
+
+ vlc_mutex_unlock( &p_input->stream.stream_lock );
+ }
+
+ [o_btn_stop setEnabled: b_input];
+ [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 setFloatValue: 0.0];
+ [o_timeslider setEnabled: b_seekable];
+ [o_timefield setStringValue: @"0:00:00"];
+
+ [self manageVolumeSlider];
+ p_intf->p_sys->b_intf_update = VLC_FALSE;
}
- [self setControlItems];
-}
-- (void)setControlItems {
- intf_thread_t * p_intf = [NSApp getIntf];
- vlc_bool_t b_input;
- vlc_bool_t b_plmul = NO;
- vlc_bool_t b_control = NO;
- vlc_bool_t b_chapters = NO;
- input_area_t * p_area;
- playlist_t * p_playlist = NULL;
- NSImage *playImage = [NSImage imageNamed:@"play"];
- NSImage *pauseImage = [NSImage imageNamed:@"pause"];
-
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
+ if( p_intf->p_sys->b_fullscreen_update )
{
- vlc_mutex_lock( &p_playlist->object_lock );
- b_plmul = p_playlist->i_size > 1;
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- }
-
- if ( b_input = ( p_intf->p_sys->p_input != NULL ) )
- {
- /* control buttons for free pace streams */
- b_control = p_intf->p_sys->p_input->stream.b_pace_control;
- p_area = p_intf->p_sys->p_input->stream.p_selected_area;
- if ( p_area->i_part_nb > 1 )
- b_chapters = YES;
- }
-
- /* set control items */
- [o_btn_stop setEnabled: b_input];
- [o_btn_fastforward setEnabled: b_control];
- [o_btn_slowmotion setEnabled: b_control];
- [o_btn_prev setEnabled: (b_plmul || b_chapters) ];
- [o_btn_next setEnabled: (b_plmul || b_chapters) ];
- [o_controls setVolumeSlider];
- [o_timeslider setEnabled: b_input];
-
- if ( (p_intf->p_sys->b_loop = config_GetInt( p_intf, "loop" )) )
- {
- [o_mi_loop setState: NSOnState];
- }
- else
- {
- [o_mi_loop setState: NSOffState];
+ vout_thread_t * p_vout;
+ vlc_value_t val;
+
+ [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
+
+ 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_intf->p_sys->p_input != NULL &&
- p_intf->p_sys->p_input->stream.control.i_status != PAUSE_S)
+ if( p_intf->p_sys->b_playing && p_input != NULL )
{
- [o_btn_play setImage: pauseImage];
- [o_btn_play setToolTip: _NS("Pause")];
- [o_mi_play setTitle: _NS("Pause")];
- [o_dmi_play setTitle: _NS("Pause")];
- }
- else
- {
- [o_btn_play setImage: playImage];
- [o_btn_play setToolTip: _NS("Play")];
- [o_mi_play setTitle: _NS("Play")];
- [o_dmi_play setTitle: _NS("Play")];
- }
-}
-
-- (void)setupMenus
-{
- unsigned int i, i_nb_items;
- NSMenuItem * o_item;
- NSString * o_menu_title;
- char psz_title[ 256 ];
-
- es_descriptor_t * p_audio_es = NULL;
- es_descriptor_t * p_spu_es = NULL;
-
- intf_thread_t * p_intf = [NSApp getIntf];
-
- p_intf->p_sys->b_chapter_update |= p_intf->p_sys->b_title_update;
- p_intf->p_sys->b_audio_update |= p_intf->p_sys->b_title_update |
- p_intf->p_sys->b_program_update;
- p_intf->p_sys->b_spu_update |= p_intf->p_sys->b_title_update |
- p_intf->p_sys->b_program_update;
+ vlc_value_t time;
+ NSString * o_time;
+ mtime_t i_seconds;
-#define p_input (p_intf->p_sys->p_input)
+ if( p_input->stream.b_seekable )
+ {
+ vlc_value_t pos;
+ float f_updated;
+
+ var_Get( p_input, "position", &pos );
+ f_updated = 10000. * pos.f_float;
- if( p_intf->p_sys->b_program_update )
+ if( f_slider != f_updated )
+ {
+ [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];
+ }
+ if( p_input )
{
- NSMenu * o_program;
- SEL pf_toggle_program;
- pgrm_descriptor_t * p_pgrm;
+ vlc_value_t val;
+ var_Get( p_input, "state", &val );
- if( p_input->stream.p_new_program )
+ if( val.i_int != PAUSE_S )
{
- p_pgrm = p_input->stream.p_new_program;
+ p_intf->p_sys->b_play_status = TRUE;
}
else
{
- p_pgrm = p_input->stream.p_selected_program;
- }
-
- o_program = [o_mi_program submenu];
- pf_toggle_program = @selector(toggleProgram:);
-
- /* remove previous program items */
- i_nb_items = [o_program numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
- {
- [o_program removeItemAtIndex: 0];
+ p_intf->p_sys->b_play_status = FALSE;
}
+ [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ }
+ else
+ {
+ p_intf->p_sys->b_play_status = FALSE;
+ [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ [self setSubmenusEnabled: FALSE];
+ }
- /* make (un)sensitive */
- [o_mi_program setEnabled:
- p_input->stream.i_pgrm_number > 1];
+#undef p_input
- /* add program items */
- for( i = 0 ; i < p_input->stream.i_pgrm_number ; i++ )
- {
- snprintf( psz_title, sizeof(psz_title), "id %d",
- p_input->stream.pp_programs[i]->i_number );
- psz_title[sizeof(psz_title) - 1] = '\0';
+ vlc_mutex_unlock( &p_playlist->object_lock );
+ vlc_object_release( p_playlist );
- o_menu_title = [NSString stringWithCString: psz_title];
+ [self updateMessageArray];
- o_item = [o_program addItemWithTitle: o_menu_title
- action: pf_toggle_program keyEquivalent: @""];
- [o_item setTag: p_input->stream.pp_programs[i]->i_number];
- [o_item setTarget: o_controls];
+ [NSTimer scheduledTimerWithTimeInterval: 0.5
+ target: self selector: @selector(manageIntf:)
+ userInfo: nil repeats: FALSE];
+}
- if( p_pgrm == p_input->stream.pp_programs[i] )
+- (void)setupMenus
+{
+ 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 )
+ {
+#define p_input p_playlist->p_input
+ if( p_input != NULL )
+ {
+ [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
+ var: "program" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
+ var: "title" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
+ var: "chapter" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
+ var: "audio-es" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
+ var: "video-es" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
+ var: "spu-es" selector: @selector(toggleVar:)];
+
+ aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+ if ( p_aout != NULL )
+ {
+ [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
+ var: "audio-channels" selector: @selector(toggleVar:)];
+
+ [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 );
+ }
+
+ vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ if ( p_vout != NULL )
{
- [o_item setState: NSOnState];
+ [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
+ var: "video-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
+ var: "deinterlace" selector: @selector(toggleVar:)];
+ vlc_object_release( (vlc_object_t *)p_vout );
}
}
-
- p_intf->p_sys->b_program_update = 0;
+#undef p_input
}
+ vlc_object_release( (vlc_object_t *)p_playlist );
+}
- if( p_intf->p_sys->b_title_update )
- {
- NSMenu * o_title;
- SEL pf_toggle_title;
-
- o_title = [o_mi_title submenu];
- pf_toggle_title = @selector(toggleTitle:);
-
- /* remove previous title items */
- i_nb_items = [o_title numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
- {
- [o_title removeItemAtIndex: 0];
- }
+- (void)updateMessageArray
+{
+ int i_start, i_stop;
+ intf_thread_t * p_intf = [NSApp getIntf];
+ vlc_value_t quiet;
- /* make (un)sensitive */
- [o_mi_title setEnabled:
- p_input->stream.i_area_nb > 1];
+ vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
+ i_stop = *p_intf->p_sys->p_sub->pi_stop;
+ vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
- /* add title items */
- for( i = 1 ; i < p_input->stream.i_area_nb ; i++ )
+ if( p_intf->p_sys->p_sub->i_start != i_stop )
+ {
+ NSColor *o_white = [NSColor whiteColor];
+ NSColor *o_red = [NSColor redColor];
+ NSColor *o_yellow = [NSColor yellowColor];
+ NSColor *o_gray = [NSColor grayColor];
+
+ NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray };
+ static const char * ppsz_type[4] = { ": ", " error: ",
+ " warning: ", " debug: " };
+
+ for( i_start = p_intf->p_sys->p_sub->i_start;
+ i_start != i_stop;
+ i_start = (i_start+1) % VLC_MSG_QSIZE )
{
- snprintf( psz_title, sizeof(psz_title), "Title %d (%d)", i,
- p_input->stream.pp_areas[i]->i_part_nb );
- psz_title[sizeof(psz_title) - 1] = '\0';
+ NSString *o_msg;
+ NSDictionary *o_attr;
+ NSAttributedString *o_msg_color;
- o_menu_title = [NSString stringWithCString: psz_title];
+ int i_type = p_intf->p_sys->p_sub->p_msg[i_start].i_type;
- o_item = [o_title addItemWithTitle: o_menu_title
- action: pf_toggle_title keyEquivalent: @""];
- [o_item setTag: i];
- [o_item setTarget: o_controls];
+ [o_msg_lock lock];
- if( ( p_input->stream.pp_areas[i] ==
- p_input->stream.p_selected_area ) )
+ if( [o_msg_arr count] + 2 > 400 )
{
- [o_item setState: NSOnState];
+ unsigned rid[] = { 0, 1 };
+ [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid
+ numIndices: sizeof(rid)/sizeof(rid[0])];
}
- }
-
- p_intf->p_sys->b_title_update = 0;
- }
-
- if( p_intf->p_sys->b_chapter_update )
- {
- NSMenu * o_chapter;
- SEL pf_toggle_chapter;
- o_chapter = [o_mi_chapter submenu];
- pf_toggle_chapter = @selector(toggleChapter:);
+ o_attr = [NSDictionary dictionaryWithObject: o_gray
+ forKey: NSForegroundColorAttributeName];
+ o_msg = [NSString stringWithFormat: @"%s%s",
+ p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
+ ppsz_type[i_type]];
+ o_msg_color = [[NSAttributedString alloc]
+ initWithString: o_msg attributes: o_attr];
+ [o_msg_arr addObject: [o_msg_color autorelease]];
- /* remove previous chapter items */
- i_nb_items = [o_chapter numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
- {
- [o_chapter removeItemAtIndex: 0];
- }
+ o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type]
+ forKey: NSForegroundColorAttributeName];
+ o_msg = [NSString stringWithFormat: @"%s\n",
+ p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
+ o_msg_color = [[NSAttributedString alloc]
+ initWithString: o_msg attributes: o_attr];
+ [o_msg_arr addObject: [o_msg_color autorelease]];
- /* make (un)sensitive */
- [o_mi_chapter setEnabled:
- p_input->stream.p_selected_area->i_part_nb > 1];
+ [o_msg_lock unlock];
- /* add chapter items */
- for( i = 0 ; i < p_input->stream.p_selected_area->i_part_nb ; i++ )
- {
- snprintf( psz_title, sizeof(psz_title), "Chapter %d", i + 1 );
- psz_title[sizeof(psz_title) - 1] = '\0';
+ var_Get( p_intf->p_vlc, "verbose", &quiet );
- o_menu_title = [NSString stringWithCString: psz_title];
+ 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];
- o_item = [o_chapter addItemWithTitle: o_menu_title
- action: pf_toggle_chapter keyEquivalent: @""];
- [o_item setTag: i + 1];
- [o_item setTarget: o_controls];
+ 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];
- if( ( p_input->stream.p_selected_area->i_part == i + 1 ) )
- {
- [o_item setState: NSOnState];
+ [o_error makeKeyAndOrderFront: self];
+ [o_err_msg setEditable: NO];
}
}
- p_intf->p_sys->i_part =
- p_input->stream.p_selected_area->i_part;
-
- p_intf->p_sys->b_chapter_update = 0;
+ vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
+ p_intf->p_sys->p_sub->i_start = i_start;
+ vlc_mutex_unlock( p_intf->p_sys->p_sub->p_lock );
}
+}
- for( i = 0 ; i < p_input->stream.i_selected_es_number ; i++ )
+- (void)playStatusUpdated:(BOOL)b_pause
+{
+ if( b_pause )
{
- if( p_input->stream.pp_selected_es[i]->i_cat == AUDIO_ES )
- {
- p_audio_es = p_input->stream.pp_selected_es[i];
- }
- else if( p_input->stream.pp_selected_es[i]->i_cat == SPU_ES )
- {
- p_spu_es = p_input->stream.pp_selected_es[i];
- }
+ [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")];
}
-
- vlc_mutex_unlock( &p_input->stream.stream_lock );
-
- if( p_intf->p_sys->b_audio_update )
+ else
{
- [self setupLangMenu: o_mi_language es: p_audio_es
- category: AUDIO_ES selector: @selector(toggleLanguage:)];
-
- p_intf->p_sys->b_audio_update = 0;
+ [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")];
}
+}
- if( p_intf->p_sys->b_spu_update )
- {
- [self setupLangMenu: o_mi_subtitle es: p_spu_es
- category: SPU_ES selector: @selector(toggleLanguage:)];
-
- p_intf->p_sys->b_spu_update = 0;
- }
+- (void)setSubmenusEnabled:(BOOL)b_enabled
+{
+ [o_mi_program setEnabled: b_enabled];
+ [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];
+ [o_mi_deinterlace setEnabled: b_enabled];
+ [o_mi_device setEnabled: b_enabled];
+ [o_mi_screen setEnabled: b_enabled];
+}
- if ( p_intf->p_sys->b_aout_update )
- {
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+- (void)manageVolumeSlider
+{
+ audio_volume_t i_volume;
+ intf_thread_t * p_intf = [NSApp getIntf];
- if ( p_aout != NULL )
- {
- vlc_value_t val;
- val.b_bool = 0;
+ aout_VolumeGet( p_intf, &i_volume );
- var_Set( (vlc_object_t *)p_aout, "intf-change", val );
+ [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
+ [o_volumeslider setEnabled: TRUE];
- [self setupVarMenu: o_mi_channels target: (vlc_object_t *)p_aout
- var: "audio-channels" selector: @selector(toggleVar:)];
+ p_intf->p_sys->b_mute = ( i_volume == 0 );
+}
- [self setupVarMenu: o_mi_device target: (vlc_object_t *)p_aout
- var: "audio-device" selector: @selector(toggleVar:)];
+- (IBAction)timesliderUpdate:(id)sender
+{
+ intf_thread_t * p_intf;
+ input_thread_t * p_input;
+ float f_updated;
- vlc_object_release( (vlc_object_t *)p_aout );
- }
+ switch( [[NSApp currentEvent] type] )
+ {
+ case NSLeftMouseUp:
+ case NSLeftMouseDown:
+ case NSLeftMouseDragged:
+ f_updated = [sender floatValue];
+ break;
- p_intf->p_sys->b_aout_update = 0;
+ default:
+ return;
}
- if ( p_intf->p_sys->b_vout_update )
+ p_intf = [NSApp getIntf];
+ p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
+ FIND_ANYWHERE );
+
+ if( p_input != NULL )
{
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ vlc_value_t time;
+ mtime_t i_seconds;
+ NSString * o_time;
- if ( p_vout != NULL )
+ if( p_input->stream.b_seekable )
{
- vlc_value_t val;
- val.b_bool = 0;
-
- var_Set( (vlc_object_t *)p_vout, "intf-change", val );
-
- [self setupVarMenu: o_mi_screen target: (vlc_object_t *)p_vout
- var: "video-device" selector: @selector(toggleVar:)];
-
- vlc_object_release( (vlc_object_t *)p_vout );
-
- [o_mi_close_window setEnabled: TRUE];
+ 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];
+ }
}
-
- p_intf->p_sys->b_vout_update = 0;
+
+ 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_object_release( p_input );
}
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
-#undef p_input
}
-- (void)setupLangMenu:(NSMenuItem *)o_mi
- es:(es_descriptor_t *)p_es
- category:(int)i_cat
- selector:(SEL)pf_callback
+- (void)terminate
{
- unsigned int i, i_nb_items;
- NSMenu * o_menu = [o_mi submenu];
+ NSEvent * o_event;
+ playlist_t * p_playlist;
+ vout_thread_t * p_vout;
intf_thread_t * p_intf = [NSApp getIntf];
- /* remove previous language items */
- i_nb_items = [o_menu numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
+ /* Stop playback */
+ if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE ) ) )
{
- [o_menu removeItemAtIndex: 0];
+ playlist_Stop( p_playlist );
+ vlc_object_release( p_playlist );
}
- /* make sensitive : we can't change it after we build the menu, and
- * before, we don't yet how many items we will have. So make it
- * always sensitive. --Meuuh */
- [o_mi setEnabled: TRUE];
-
-#if 0
- /* We do not use this code, because you need to start stop .avi for
- * it to work, so not very useful now --hartman */
- if ( o_mi == o_mi_subtitle ) {
- NSLog(@"testing");
- [o_mi setEnabled: TRUE ];
- NSMenuItem * o_lmi;
- NSString * o_title;
- o_title = _NS("Load from file..");
- o_lmi = [o_menu addItemWithTitle: o_title
- action: pf_callback keyEquivalent: @""];
- [o_lmi setTag: 2000];
- [o_lmi setTarget: o_controls];
+ /* FIXME - Wait here until all vouts are terminated because
+ libvlc's VLC_Stop destroys interfaces before vouts, which isn't
+ good on OS X. We definitly need a cleaner way to handle this,
+ but this may hopefully be good enough for now.
+ -- titer 2003/11/22 */
+ while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE ) ) )
+ {
+ vlc_object_release( p_vout );
+ msleep( 100000 );
}
-#endif
+ msleep( 500000 );
- vlc_mutex_lock( &p_intf->p_sys->p_input->stream.stream_lock );
-
-#define ES p_intf->p_sys->p_input->stream.pp_es[i]
- for( i = 0 ; i < p_intf->p_sys->p_input->stream.i_es_number ; i++ )
+ if( o_img_pause_pressed != nil )
{
- if( ( ES->i_cat == i_cat ) &&
- ( !ES->p_pgrm ||
- ES->p_pgrm ==
- p_intf->p_sys->p_input->stream.p_selected_program ) )
- {
- NSMenuItem * o_lmi;
- NSString * o_title;
-
- if( *ES->psz_desc )
- {
- o_title = [NSString stringWithCString: ES->psz_desc];
- }
- else
- {
- char psz_title[ 256 ];
-
- snprintf( psz_title, sizeof(psz_title), "Language 0x%x",
- ES->i_id );
- psz_title[sizeof(psz_title) - 1] = '\0';
-
- o_title = [NSString stringWithCString: psz_title];
- }
-
- o_lmi = [o_menu addItemWithTitle: o_title
- action: pf_callback keyEquivalent: @""];
- [o_lmi setRepresentedObject:
- [NSValue valueWithPointer: ES]];
- [o_lmi setTarget: o_controls];
- [o_lmi setTag: i_cat];
-
- if( /*p_es == ES*/ ES->p_decoder_fifo != NULL )
- {
- [o_lmi setState: NSOnState];
- }
- }
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
}
-#undef ES
-
- vlc_mutex_unlock( &p_intf->p_sys->p_input->stream.stream_lock );
-}
-
-- (void)setupVarMenu:(NSMenuItem *)o_mi
- target:(vlc_object_t *)p_object
- var:(const char *)psz_variable
- selector:(SEL)pf_callback
-{
- int i, i_nb_items;
- NSMenu * o_menu = [o_mi submenu];
- vlc_value_t val;
- char * psz_value;
-
- /* remove previous items */
- i_nb_items = [o_menu numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
+
+ if( o_img_pause_pressed != nil )
{
- [o_menu removeItemAtIndex: 0];
+ [o_img_pause_pressed release];
+ o_img_pause_pressed = nil;
}
-
- if ( var_Get( p_object, psz_variable, &val ) < 0 )
+
+ if( o_img_pause != nil )
{
- return;
+ [o_img_pause release];
+ o_img_pause = nil;
}
- psz_value = val.psz_string;
- if ( var_Change( p_object, psz_variable,
- VLC_VAR_GETLIST, &val ) < 0 )
+ if( o_img_play != nil )
{
- free( psz_value );
- return;
+ [o_img_play release];
+ o_img_play = nil;
}
- /* make (un)sensitive */
- [o_mi setEnabled: ( val.p_list->i_count > 0 )];
+ if( o_msg_arr != nil )
+ {
+ [o_msg_arr removeAllObjects];
+ [o_msg_arr release];
+ o_msg_arr = nil;
+ }
- for ( i = 0; i < val.p_list->i_count; i++ )
+ if( o_msg_lock != nil )
{
- NSMenuItem * o_lmi;
- NSString * o_title;
-
- o_title = [NSString stringWithCString: val.p_list->p_values[i].psz_string];
- o_lmi = [o_menu addItemWithTitle: o_title
- action: pf_callback keyEquivalent: @""];
- /* FIXME: this isn't 64-bit clean ! */
- [o_lmi setTag: (int)psz_variable];
- [o_lmi setRepresentedObject:
- [NSValue valueWithPointer: p_object]];
- [o_lmi setTarget: o_controls];
-
- if ( !strcmp( psz_value, val.p_list->p_values[i].psz_string ) )
- [o_lmi setState: NSOnState];
+ [o_msg_lock release];
+ o_msg_lock = nil;
}
- var_Change( p_object, psz_variable, VLC_VAR_FREELIST,
- &val );
+ [NSApp terminate: nil];
+ [NSApp stop: nil];
+
+ /* write cached user defaults to disk */
+ [[NSUserDefaults standardUserDefaults] synchronize];
- free( psz_value );
+ /* 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];
}
- (IBAction)clearRecentItems:(id)sender
- (IBAction)viewPreferences:(id)sender
{
- if( o_prefs == nil )
- {
- o_prefs = [[VLCPrefs alloc] init];
- }
-
- [o_prefs createPrefPanel: @"main"];
+ [o_prefs showPrefs];
}
-- (IBAction)timesliderUpdate:(id)sender
-{
- switch( [[NSApp currentEvent] type] )
- {
- case NSLeftMouseDown:
- f_slider = [sender floatValue];
- [self displayTime];
- break;
-
- case NSLeftMouseDragged:
- f_slider = [sender floatValue];
- [self displayTime];
- break;
-
- case NSLeftMouseUp:
- f_slider = [sender floatValue];
- [self displayTime];
- intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = p_intf->p_sys->p_input;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
- break;
-
- default:
- break;
- }
-}
-
-- (void)displayTime
+- (IBAction)closeError:(id)sender
{
+ vlc_value_t val;
intf_thread_t * p_intf = [NSApp getIntf];
- input_thread_t * p_input = p_intf->p_sys->p_input;
-
- if( p_input == NULL )
- {
- [o_timeslider setEnabled: FALSE];
- [o_timeslider setFloatValue: 0.0];
- [o_timefield setStringValue: @"0:00:00"];
-
- return;
- }
-
-#define p_area p_input->stream.p_selected_area
-
- if( p_input->stream.b_changed )
- {
- [o_timeslider setEnabled: p_input->stream.b_seekable];
- }
- else if( p_intf->p_sys->b_playing )
+
+ if( [o_err_ckbk_surpress state] == NSOnState )
{
- NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
-
- input_OffsetToTime( p_input, psz_time, p_area->i_tell );
-
- o_time = [NSString stringWithCString: psz_time];
- [o_timefield setStringValue: o_time];
-
- if( p_input->stream.b_seekable )
- {
- if( f_slider == f_slider_old )
- {
- float f_updated = ( 100. * p_area->i_tell ) /
- p_area->i_size;
-
- if( f_slider != f_updated )
- {
- [o_timeslider setFloatValue: f_updated];
- }
- }
- else
- {
- off_t i_seek = ( f_slider * p_area->i_size ) / 100;
-
- /* 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 );
-
- /* Update the old value */
- f_slider_old = f_slider;
- }
- }
+ val.i_int = -1;
+ var_Set( p_intf->p_vlc, "verbose", val );
}
-#undef p_area
-}
-
-- (IBAction)closeError:(id)sender
-{
- /* Error panel */
[o_err_msg setString: @""];
[o_error performClose: self];
}
{
NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"README.MacOSX" ofType: @"rtf"];
-
+
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
+- (IBAction)openDocumentation:(id)sender
+{
+ NSURL * o_url = [NSURL URLWithString:
+ @"http://www.videolan.org/doc/"];
+
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
+}
+
- (IBAction)reportABug:(id)sender
{
NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/support/bug-reporting.html"];
-
+
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
- (IBAction)openWebsite:(id)sender
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"];
-
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
+
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
{
NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"COPYING" ofType: nil];
-
+
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
+- (IBAction)openCrashLog:(id)sender
+{
+ NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
+ stringByExpandingTildeInPath];
+
+
+ if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
+ {
+ [[NSWorkspace sharedWorkspace] openFile: o_path
+ withApplication: @"Console"];
+ }
+ else
+ {
+ NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Either you are running Mac OS X pre 10.2 or you haven't experienced any heavy crashes yet.") );
+
+ }
+}
+
- (void)windowDidBecomeKey:(NSNotification *)o_notification
{
if( [o_notification object] == o_msgs_panel )
- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{
+ NSString *o_title = [o_mi title];
BOOL bEnabled = TRUE;
- /* Recent Items Menu */
+ if( [o_title isEqualToString: _NS("License")] )
+ {
+ /* we need to do this only once */
+ [self setupMenus];
+ }
- if( [[o_mi title] isEqualToString: _NS("Clear Menu")] )
+ /* Recent Items Menu */
+ if( [o_title isEqualToString: _NS("Clear Menu")] )
{
NSMenu * o_menu = [o_mi_open_recent submenu];
int i_nb_items = [o_menu numberOfItems];
bEnabled = FALSE;
}
}
-
return( bEnabled );
}
- (void)handlePortMessage:(NSPortMessage *)o_msg
{
+ id ** val;
NSData * o_data;
NSValue * o_value;
NSInvocation * o_inv;
- vout_thread_t * p_vout;
+ NSConditionLock * o_lock;
o_data = [[o_msg components] lastObject];
o_inv = *((NSInvocation **)[o_data bytes]);
[o_inv getArgument: &o_value atIndex: 2];
- p_vout = (vout_thread_t *)[o_value pointerValue];
+ val = (id **)[o_value pointerValue];
+ [o_inv setArgument: val[1] atIndex: 2];
+ o_lock = *(val[0]);
- [p_vout->p_sys->o_lock lock];
+ [o_lock lock];
[o_inv invoke];
- [p_vout->p_sys->o_lock unlockWithCondition: 1];
+ [o_lock unlockWithCondition: 1];
}
@end
projects / vlc / blobdiff