/*****************************************************************************
- * intf.m: MacOS X interface plugin
+ * intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: intf.m,v 1.73 2003/05/05 22:04:11 hartman Exp $
+ * Copyright (C) 2002-2008 the VideoLAN team
+ * $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>
+ * Felix Paul Kühne <fkuehne at videolan dot 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
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include <stdlib.h> /* malloc(), free() */
#include <sys/param.h> /* for MAXPATHLEN */
#include <string.h>
+#include <vlc_keys.h>
+
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
-#include "intf.h"
-#include "vout.h"
-#include "prefs.h"
-#include "playlist.h"
-#include "info.h"
+#import "intf.h"
+#import "fspanel.h"
+#import "vout.h"
+#import "prefs.h"
+#import "playlist.h"
+#import "playlistinfo.h"
+#import "controls.h"
+#import "about.h"
+#import "open.h"
+#import "wizard.h"
+#import "extended.h"
+#import "bookmarks.h"
+#import "interaction.h"
+#import "embeddedwindow.h"
+#import "update.h"
+#import "AppleRemote.h"
+#import "eyetv.h"
+#import "simple_prefs.h"
+
+#import <vlc_input.h>
+#import <vlc_interface.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
static void Run ( intf_thread_t *p_intf );
+/* Quick hack */
+/*****************************************************************************
+ * VLCApplication implementation (this hack is really disgusting now,
+ * feel free to fix.)
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+ libvlc_int_t *o_libvlc;
+}
+- (void)setVLC: (libvlc_int_t *)p_libvlc;
+@end
+
+
+@implementation VLCApplication
+- (void)setVLC: (libvlc_int_t *) p_libvlc
+{
+ o_libvlc = p_libvlc;
+}
+- (void)terminate: (id)sender
+{
+ vlc_object_kill( o_libvlc );
+ [super terminate: sender];
+}
+@end
+
/*****************************************************************************
* OpenIntf: initialize interface
*****************************************************************************/
-int E_(OpenIntf) ( vlc_object_t *p_this )
-{
+int OpenIntf ( vlc_object_t *p_this )
+{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
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];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf );
-
p_intf->pf_run = Run;
-
- [[VLCApplication sharedApplication] autorelease];
- [NSApp initIntlSupport];
- [NSApp setIntf: p_intf];
-
- [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
+ p_intf->b_should_run_on_first_thread = true;
return( 0 );
}
/*****************************************************************************
* CloseIntf: destroy interface
*****************************************************************************/
-void E_(CloseIntf) ( vlc_object_t *p_this )
+void CloseIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ [[VLCMain sharedInstance] setIntf: nil];
+
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
- config_SaveConfigFile( p_intf, MODULE_STRING );
-
- [p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
free( p_intf->p_sys );
/*****************************************************************************
* Run: main loop
*****************************************************************************/
+jmp_buf jmpbuffer;
+
static void Run( intf_thread_t *p_intf )
{
+ sigset_t set;
+
/* Do it again - for some unknown reason, vlc_thread_create() often
* fails to go to real-time priority with the first launched thread
* (???) --Meuuh */
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
- [NSApp run];
+ /* Make sure the "force quit" menu item does quit instantly.
+ * VLC overrides SIGTERM which is sent by the "force quit"
+ * menu item to make sure deamon mode quits gracefully, so
+ * we un-override SIGTERM here. */
+ sigemptyset( &set );
+ sigaddset( &set, SIGTERM );
+ pthread_sigmask( SIG_UNBLOCK, &set, NULL );
+
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+
+ /* Install a jmpbuffer to where we can go back before the NSApp exit
+ * see applicationWillTerminate: */
+ /* We need that code to run on main thread */
+ [VLCApplication sharedApplication];
+ [NSApp setVLC: p_intf->p_libvlc];
+
+ [[VLCMain sharedInstance] setIntf: p_intf];
+ [NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
+
+ /* Install a jmpbuffer to where we can go back before the NSApp exit
+ * see applicationWillTerminate: */
+ if(setjmp(jmpbuffer) == 0)
+ [NSApp run];
+
+ [o_pool release];
}
/*****************************************************************************
- * VLCApplication implementation
+ * ManageThread: An ugly thread that polls
*****************************************************************************/
-@implementation VLCApplication
+static void * ManageThread( void *user_data )
+{
+ id self = user_data;
-- (id)init
+ [self manage];
+
+ return NULL;
+}
+
+/*****************************************************************************
+ * playlistChanged: Callback triggered by the intf-change playlist
+ * variable, to let the intf update the playlist.
+ *****************************************************************************/
+static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
{
- /* default encoding: ISO-8859-1 */
- i_encoding = NSISOLatin1StringEncoding;
+ intf_thread_t * p_intf = VLCIntf;
+ p_intf->p_sys->b_intf_update = true;
+ p_intf->p_sys->b_playlist_update = true;
+ p_intf->p_sys->b_playmode_update = true;
+ p_intf->p_sys->b_current_title_update = true;
+ return VLC_SUCCESS;
+}
- return( [super init] );
+/*****************************************************************************
+ * ShowController: Callback triggered by the show-intf playlist variable
+ * through the ShowIntf-control-intf, to let us show the controller-win;
+ * usually when in fullscreen-mode
+ *****************************************************************************/
+static int ShowController( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ intf_thread_t * p_intf = VLCIntf;
+ p_intf->p_sys->b_intf_show = true;
+ return VLC_SUCCESS;
}
-- (void)initIntlSupport
+/*****************************************************************************
+ * FullscreenChanged: Callback triggered by the fullscreen-change playlist
+ * variable, to let the intf update the controller.
+ *****************************************************************************/
+static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
{
- char *psz_lang = getenv( "LANG" );
+ intf_thread_t * p_intf = VLCIntf;
+ p_intf->p_sys->b_fullscreen_update = true;
+ return VLC_SUCCESS;
+}
- if( psz_lang == NULL )
- {
- return;
- }
+/*****************************************************************************
+ * InteractCallback: Callback triggered by the interaction
+ * variable, to let the intf display error and interaction dialogs
+ *****************************************************************************/
+static int InteractCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ VLCMain *interface = (VLCMain *)param;
+ interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address);
+ NSValue *o_value = [NSValue valueWithPointer:p_dialog];
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList]
+ userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]];
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
- if( strncmp( psz_lang, "pl", 2 ) == 0 )
- {
- i_encoding = NSISOLatin2StringEncoding;
- }
- else if( strncmp( psz_lang, "ja", 2 ) == 0 )
+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++ )
{
- i_encoding = NSJapaneseEUCStringEncoding;
+ if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
+ {
+ return nskeys_to_vlckeys[i].i_nskey;
+ }
}
- else if( strncmp( psz_lang, "ru", 2 ) == 0 )
+ 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++ )
{
-#define CFSENC2NSSENC(e) CFStringConvertEncodingToNSStringEncoding(e)
- i_encoding = CFSENC2NSSENC( kCFStringEncodingKOI8_R );
-#undef CFSENC2NSSENC
+ if( nskeys_to_vlckeys[i].i_nskey == i_key )
+ {
+ return nskeys_to_vlckeys[i].i_vlckey;
+ }
}
+ return (unsigned int)i_key;
}
-- (NSString *)localizedString:(char *)psz
+unsigned int VLCModifiersToCocoa( unsigned int i_key )
{
- NSString * o_str = nil;
+ 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;
+}
- if( psz != NULL )
+/*****************************************************************************
+ * VLCMain implementation
+ *****************************************************************************/
+@implementation VLCMain
+
+static VLCMain *_o_sharedMainInstance = nil;
+
++ (VLCMain *)sharedInstance
+{
+ return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
+}
+
+- (id)init
+{
+ if( _o_sharedMainInstance)
{
- UInt32 uiLength = (UInt32)strlen( psz );
- NSData * o_data = [NSData dataWithBytes: psz length: uiLength];
- o_str = [[[NSString alloc] initWithData: o_data
- encoding: i_encoding] autorelease];
- }
+ [self dealloc];
+ return _o_sharedMainInstance;
+ }
+ else
+ _o_sharedMainInstance = [super init];
+
+ o_about = [[VLAboutBox alloc] init];
+ o_prefs = nil;
+ o_open = [[VLCOpen alloc] init];
+ o_wizard = [[VLCWizard alloc] init];
+ o_extended = nil;
+ o_bookmarks = [[VLCBookmarks alloc] init];
+ o_embedded_list = [[VLCEmbeddedList alloc] init];
+ o_interaction_list = [[VLCInteractionList alloc] init];
+ o_info = [[VLCInfo alloc] init];
+#ifdef UPDATE_CHECK
+ o_update = [[VLCUpdate alloc] init];
+#endif
- return( o_str );
+ i_lastShownVolume = -1;
+
+ o_remote = [[AppleRemote alloc] init];
+ [o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
+ [o_remote setDelegate: _o_sharedMainInstance];
+
+ o_eyetv = [[VLCEyeTVController alloc] init];
+
+ /* announce our launch to a potential eyetv plugin */
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
+ object: @"VLCEyeTVSupport"
+ userInfo: NULL
+ deliverImmediately: YES];
+
+ return _o_sharedMainInstance;
}
-- (char *)delocalizeString:(NSString *)id
+- (void)setIntf: (intf_thread_t *)p_mainintf {
+ p_intf = p_mainintf;
+}
+
+- (intf_thread_t *)getIntf {
+ return p_intf;
+}
+
+- (void)awakeFromNib
{
- NSData * o_data = [id dataUsingEncoding: i_encoding
- allowLossyConversion: NO];
- char * psz_string;
+ unsigned int i_key = 0;
+ playlist_t *p_playlist;
+ vlc_value_t val;
+
+ /* Check if we already did this once. Opening the other nibs calls it too, because VLCMain is the owner */
+ if( nib_main_loaded ) return;
+
+ [self initStrings];
+
+ [o_window setExcludedFromWindowsMenu: YES];
+ [o_msgs_panel setExcludedFromWindowsMenu: YES];
+ [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+short" );
+ [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-short" );
+ [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+medium" );
+ [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-medium" );
+ [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+long" );
+ [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-long" );
+ [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)];
+ i_key = config_GetInt( p_intf, "key-snapshot" );
+ [o_mi_snapshot setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_snapshot setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+
+ var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
+
+ [self setSubmenusEnabled: FALSE];
+ [o_volumeslider setEnabled: YES];
+ [self manageVolumeSlider];
+ [o_window setDelegate: self];
+
+ b_restore_size = false;
- if ( o_data == nil )
+ // Set that here as IB seems to be buggy
+ [o_window setContentMinSize:NSMakeSize(338., 30.)];
+
+ if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. )
{
- 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 );
+ b_small_window = YES;
+ [o_window setFrame: NSMakeRect( [o_window frame].origin.x,
+ [o_window frame].origin.y, [o_window frame].size.width,
+ [o_window minSize].height ) display: YES animate:YES];
+ [o_playlist_view setAutoresizesSubviews: NO];
}
else
{
- psz_string = malloc( [o_data length] + 1 );
- [o_data getBytes: psz_string];
- psz_string[ [o_data length] ] = '\0';
+ b_small_window = NO;
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )];
+ [o_playlist_view setNeedsDisplay:YES];
+ [o_playlist_view setAutoresizesSubviews: YES];
+ [[o_window contentView] addSubview: o_playlist_view];
}
- return psz_string;
-}
+ [self updateTogglePlaylistState];
-- (NSStringEncoding)getEncoding
-{
- return i_encoding;
-}
+ o_size_with_playlist = [o_window contentRectForFrameRect:[o_window frame]].size;
-- (void)setIntf:(intf_thread_t *)_p_intf
-{
- p_intf = _p_intf;
+ p_playlist = pl_Yield( p_intf );
+
+ var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
+ val.b_bool = false;
+
+ var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+ var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self);
+
+ pl_Release( p_intf );
+
+ var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
+ var_AddCallback( p_intf, "interaction", InteractCallback, self );
+ p_intf->b_interaction = true;
+
+ /* update the playmode stuff */
+ p_intf->p_sys->b_playmode_update = true;
+
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector(refreshVoutDeviceMenu:)
+ name: NSApplicationDidChangeScreenParametersNotification
+ object: nil];
+
+ o_img_play = [NSImage imageNamed: @"play"];
+ o_img_pause = [NSImage imageNamed: @"pause"];
+
+ [self controlTintChanged];
+
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector( controlTintChanged )
+ name: NSControlTintDidChangeNotification
+ object: nil];
+
+ nib_main_loaded = TRUE;
}
-- (intf_thread_t *)getIntf
+#pragma mark Toolbar delegate
+/* Our item identifiers */
+static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl";
+
+- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
{
- return( p_intf );
+ return [NSArray arrayWithObjects:
+// NSToolbarCustomizeToolbarItemIdentifier,
+// NSToolbarFlexibleSpaceItemIdentifier,
+// NSToolbarSpaceItemIdentifier,
+// NSToolbarSeparatorItemIdentifier,
+ VLCToolbarMediaControl,
+ nil ];
}
-- (void)terminate:(id)sender
+- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
{
- p_intf->p_vlc->b_die = VLC_TRUE;
+ return [NSArray arrayWithObjects:
+ VLCToolbarMediaControl,
+ nil ];
}
-@end
-
-int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
+- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
{
- int i_ret = 0;
-
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
- 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];
- }
+
+ if( [itemIdentifier isEqual: VLCToolbarMediaControl] )
+ {
+ [toolbarItem setLabel:@"Media Controls"];
+ [toolbarItem setPaletteLabel:@"Media Controls"];
+
+ NSSize size = toolbarMediaControl.frame.size;
+ [toolbarItem setView:toolbarMediaControl];
+ [toolbarItem setMinSize:size];
+ size.width += 1000.;
+ [toolbarItem setMaxSize:size];
+
+ // Hack: For some reason we need to make sure
+ // that the those element are on top
+ // Add them again will put them frontmost
+ [toolbarMediaControl addSubview:o_scrollfield];
+ [toolbarMediaControl addSubview:o_timeslider];
+ [toolbarMediaControl addSubview:o_timefield];
+ [toolbarMediaControl addSubview:o_main_pgbar];
+
+ /* TODO: setup a menu */
+ }
else
{
- i_ret = 1;
+ /* itemIdentifier referred to a toolbar item that is not
+ * provided or supported by us or Cocoa
+ * Returning nil will inform the toolbar
+ * that this kind of item is not supported */
+ toolbarItem = nil;
}
+ return toolbarItem;
+}
- [o_pool release];
+#pragma mark -
- return( i_ret );
+- (void)controlTintChanged
+{
+ BOOL b_playing = NO;
+
+ if( [o_btn_play alternateImage] == o_img_play_pressed )
+ b_playing = YES;
+
+ if( [NSColor currentControlTint] == NSGraphiteControlTint )
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_graphite"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_graphite"];
+
+ [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_graphite"]];
+ [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_graphite"]];
+ [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_graphite"]];
+ [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_graphite"]];
+ [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_graphite"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
+ [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_graphite"]];
+ [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_graphite"]];
+ }
+ else
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_blue"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_blue"];
+
+ [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_blue"]];
+ [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_blue"]];
+ [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_blue"]];
+ [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_blue"]];
+ [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_blue"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
+ [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_blue"]];
+ [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_blue"]];
+ }
+
+ if( b_playing )
+ [o_btn_play setAlternateImage: o_img_play_pressed];
+ else
+ [o_btn_play setAlternateImage: o_img_pause_pressed];
}
-/*****************************************************************************
- * VLCMain implementation
- *****************************************************************************/
-@implementation VLCMain
-
-- (void)awakeFromNib
+- (void)initStrings
{
- [o_window setTitle: _NS("VLC - Controller")];
- [o_window setExcludedFromWindowsMenu: TRUE];
+ [o_window setTitle: _NS("VLC")];
+ [self setScrollField:_NS("VLC media player") stopAfter:-1];
/* 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")];
+ [o_btn_playlist setToolTip: _NS("Playlist")];
- /* messages panel */
- [o_msgs_panel setDelegate: self];
+ /* messages panel */
[o_msgs_panel setTitle: _NS("Messages")];
- [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
- [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
+ [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog...")];
/* main menu */
- [o_mi_about setTitle: _NS("About VLC media player")];
+ [o_mi_about setTitle: [_NS("About VLC media player") \
+ stringByAppendingString: @"..."]];
+ [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
[o_mi_prefs setTitle: _NS("Preferences...")];
+ [o_mi_add_intf setTitle: _NS("Add Interface")];
+ [o_mu_add_intf setTitle: _NS("Add Interface")];
+ [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_capture setTitle: _NS("Open Capture Device...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
+ [o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mu_edit setTitle: _NS("Edit")];
[o_mi_cut setTitle: _NS("Cut")];
[o_mi_clear setTitle: _NS("Clear")];
[o_mi_select_all setTitle: _NS("Select All")];
- [o_mu_controls setTitle: _NS("Controls")];
+ [o_mu_controls setTitle: _NS("Playback")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_stop setTitle: _NS("Stop")];
[o_mi_faster setTitle: _NS("Faster")];
[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_floatontop setTitle: _NS("Float On Top")];
- [o_mi_screen setTitle: _NS("Screen")];
+ [o_mi_floatontop setTitle: _NS("Float on Top")];
+ [o_mi_snapshot setTitle: _NS("Snapshot")];
+ [o_mi_videotrack setTitle: _NS("Video Track")];
+ [o_mu_videotrack setTitle: _NS("Video Track")];
+ [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [o_mi_crop setTitle: _NS("Crop")];
+ [o_mu_crop setTitle: _NS("Crop")];
+ [o_mi_screen setTitle: _NS("Fullscreen Video Device")];
+ [o_mu_screen setTitle: _NS("Fullscreen Video Device")];
+ [o_mi_subtitle setTitle: _NS("Subtitles Track")];
+ [o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
+ [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
+ [o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
[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_controller setTitle: _NS("Controller...")];
+ [o_mi_equalizer setTitle: _NS("Equalizer...")];
+ [o_mi_extended setTitle: _NS("Extended Controls...")];
+ [o_mi_bookmarks setTitle: _NS("Bookmarks...")];
+ [o_mi_playlist setTitle: _NS("Playlist...")];
+ [o_mi_info setTitle: _NS("Media Information...")];
+ [o_mi_messages setTitle: _NS("Messages...")];
+ [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings...")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
[o_mu_help setTitle: _NS("Help")];
- [o_mi_readme setTitle: _NS("ReadMe...")];
- [o_mi_reportabug setTitle: _NS("Report a Bug")];
- [o_mi_website setTitle: _NS("VideoLAN Website")];
+ [o_mi_help setTitle: _NS("VLC media player Help...")];
+ [o_mi_readme setTitle: _NS("ReadMe / FAQ...")];
[o_mi_license setTitle: _NS("License")];
+ [o_mi_documentation setTitle: _NS("Online Documentation...")];
+ [o_mi_website setTitle: _NS("VideoLAN Website...")];
+ [o_mi_donation setTitle: _NS("Make a donation...")];
+ [o_mi_forum setTitle: _NS("Online Forum...")];
/* 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")];
-
- /* error panel */
- [o_error setTitle: _NS("Error")];
- [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
- [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
- [o_err_btn_msgs setTitle: _NS("Open Messages Window")];
- [o_err_btn_dismiss setTitle: _NS("Dismiss")];
-
- [o_info_window setTitle: _NS("Info")];
-
- [self setSubmenusEnabled: FALSE];
- [self manageVolumeSlider];
+ [o_dmi_mute setTitle: _NS("Mute")];
+
+ /* vout menu */
+ [o_vmi_play setTitle: _NS("Play")];
+ [o_vmi_stop setTitle: _NS("Stop")];
+ [o_vmi_prev setTitle: _NS("Previous")];
+ [o_vmi_next setTitle: _NS("Next")];
+ [o_vmi_volup setTitle: _NS("Volume Up")];
+ [o_vmi_voldown setTitle: _NS("Volume Down")];
+ [o_vmi_mute setTitle: _NS("Mute")];
+ [o_vmi_fullscreen setTitle: _NS("Fullscreen")];
+ [o_vmi_snapshot setTitle: _NS("Snapshot")];
}
- (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_pause = [[NSImage imageNamed: @"pause"] retain];
+ /* FIXME: don't poll */
+ interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
+ target: self selector: @selector(manageIntf:)
+ userInfo: nil repeats: FALSE] retain];
- [p_intf->p_sys->o_sendport setDelegate: self];
- [[NSRunLoop currentRunLoop]
- addPort: p_intf->p_sys->o_sendport
- forMode: NSDefaultRunLoopMode];
+ /* Note: we use the pthread API to support pre-10.5 */
+ pthread_create( &manage_thread, NULL, ManageThread, self );
- [NSTimer scheduledTimerWithTimeInterval: 0.5
- target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE];
+ [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
+ var: "intf-add" selector: @selector(toggleVar:)];
- [NSThread detachNewThreadSelector: @selector(manage)
- toTarget: self withObject: nil];
+ /* check whether the user runs a valid version of OSX; alert is auto-released */
+ if( MACOS_VERSION < 10.4f )
+ {
+ NSAlert *ourAlert;
+ int i_returnValue;
+ ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is not supported")
+ defaultButton: _NS("Quit")
+ alternateButton: NULL
+ otherButton: NULL
+ informativeTextWithFormat: _NS("VLC media player requires Mac OS X 10.4 or higher.")];
+ [ourAlert setAlertStyle: NSCriticalAlertStyle];
+ i_returnValue = [ourAlert runModal];
+ [NSApp terminate: self];
+ }
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];
-
- [o_playlist appendArray:
- [NSArray arrayWithObject: o_filename] atPos: -1 enqueue: NO];
-
- config_PutPsz( [NSApp getIntf], "sub-file", "" );
- config_PutInt( p_intf, "sub-delay", 0 );
- config_PutFloat( p_intf, "sub-fps", 0.0 );
- config_PutPsz( p_intf, "sout", "" );
-
- return( TRUE );
-}
+ BOOL b_autoplay = config_GetInt( VLCIntf, "macosx-autoplay" );
+ NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
+ if( b_autoplay )
+ [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
+ else
+ [o_playlist appendArray: [NSArray arrayWithObject: o_dic] atPos: -1 enqueue: YES];
-- (id)getControls
-{
- if ( o_controls )
- {
- return o_controls;
- }
- return nil;
+ return( TRUE );
}
-- (void)manage
+- (NSString *)localizedString:(const char *)psz
{
- NSDate * o_sleep_date;
- intf_thread_t * p_intf = [NSApp getIntf];
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ NSString * o_str = nil;
- vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ if( psz != NULL )
+ {
+ o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
- while( !p_intf->b_die )
+ if( o_str == NULL )
+ {
+ msg_Err( VLCIntf, "could not translate: %s", psz );
+ return( @"" );
+ }
+ }
+ else
{
- playlist_t * p_playlist;
+ msg_Warn( VLCIntf, "can't translate empty strings" );
+ return( @"" );
+ }
- vlc_mutex_lock( &p_intf->change_lock );
+ return( o_str );
+}
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+/* When user click in the Dock icon our double click in the finder */
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows
+{
+ if(!hasVisibleWindows)
+ [o_window makeKeyAndOrderFront:self];
- if( p_playlist != NULL )
- {
- vlc_mutex_lock( &p_playlist->object_lock );
-
- [self manage: p_playlist];
-
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
- }
+ return YES;
+}
- vlc_mutex_unlock( &p_intf->change_lock );
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+#ifdef UPDATE_CHECK
+ /* Check for update silently on startup */
+ if( !nib_update_loaded )
+ nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
- [NSThread sleepUntilDate: o_sleep_date];
- }
+ if([o_update shouldCheckForUpdate])
+ [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL];
+#endif
- [self terminate];
+ /* Handle sleep notification */
+ [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
+ name:NSWorkspaceWillSleepNotification object:nil];
- [o_pool release];
+ [self performSelectorInBackground:@selector(lookForCrashLog) withObject:NULL];
}
-- (void)manage:(playlist_t *)p_playlist
+/* Listen to the remote in exclusive mode, only when VLC is the active
+ application */
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
{
- vlc_value_t val;
-
- intf_thread_t * p_intf = [NSApp getIntf];
+ [o_remote startListening: self];
+}
+- (void)applicationDidResignActive:(NSNotification *)aNotification
+{
+ [o_remote stopListening: self];
+}
- if( var_Get( (vlc_object_t *)p_playlist, "intf-change", &val ) >= 0 &&
- val.b_bool )
+/* Triggered when the computer goes to sleep */
+- (void)computerWillSleep: (NSNotification *)notification
+{
+ /* Pause */
+ if( p_intf->p_sys->i_play_status == PLAYING_S )
{
- p_intf->p_sys->b_playlist_update = VLC_TRUE;
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ vlc_value_t val;
+ val.i_int = config_GetInt( p_intf, "key-play-pause" );
+ var_Set( p_intf->p_libvlc, "key-pressed", val );
}
+}
-#define p_input p_playlist->p_input
-
- if( p_input )
+/* Helper method for the remote control interface in order to trigger forward/backward and volume
+ increase/decrease as long as the user holds the left/right, plus/minus button */
+- (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber
+{
+ if(b_remote_button_hold)
{
- vout_thread_t * p_vout = NULL;
- aout_instance_t * p_aout = NULL;
- vlc_bool_t b_need_menus = VLC_FALSE;
-
- vlc_mutex_lock( &p_input->stream.stream_lock );
-
- if( !p_input->b_die )
+ switch([buttonIdentifierNumber intValue])
+ {
+ case kRemoteButtonRight_Hold:
+ [o_controls forward: self];
+ break;
+ case kRemoteButtonLeft_Hold:
+ [o_controls backward: self];
+ break;
+ case kRemoteButtonVolume_Plus_Hold:
+ [o_controls volumeUp: self];
+ break;
+ case kRemoteButtonVolume_Minus_Hold:
+ [o_controls volumeDown: self];
+ break;
+ }
+ if(b_remote_button_hold)
{
- audio_volume_t i_volume;
+ /* trigger event */
+ [self performSelector:@selector(executeHoldActionForRemoteButton:)
+ withObject:buttonIdentifierNumber
+ afterDelay:0.25];
+ }
+ }
+}
- /* New input or stream map change */
- if( p_input->stream.b_changed )
- {
- p_intf->p_sys->b_playing = 1;
- [self manageMode: p_playlist];
- b_need_menus = VLC_TRUE;
+/* Apple Remote callback */
+- (void) appleRemoteButton: (AppleRemoteEventIdentifier)buttonIdentifier
+ pressedDown: (BOOL) pressedDown
+ clickCount: (unsigned int) count
+{
+ switch( buttonIdentifier )
+ {
+ case kRemoteButtonPlay:
+ if(count >= 2) {
+ [o_controls toogleFullscreen:self];
+ } else {
+ [o_controls play: self];
}
-
- if( p_intf->p_sys->i_part !=
- p_input->stream.p_selected_area->i_part )
+ break;
+ case kRemoteButtonVolume_Plus:
+ [o_controls volumeUp: self];
+ break;
+ case kRemoteButtonVolume_Minus:
+ [o_controls volumeDown: self];
+ break;
+ case kRemoteButtonRight:
+ [o_controls next: self];
+ break;
+ case kRemoteButtonLeft:
+ [o_controls prev: self];
+ break;
+ case kRemoteButtonRight_Hold:
+ case kRemoteButtonLeft_Hold:
+ case kRemoteButtonVolume_Plus_Hold:
+ case kRemoteButtonVolume_Minus_Hold:
+ /* simulate an event as long as the user holds the button */
+ b_remote_button_hold = pressedDown;
+ if( pressedDown )
{
- p_intf->p_sys->b_chapter_update = 1;
- b_need_menus = VLC_TRUE;
+ NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
+ [self performSelector:@selector(executeHoldActionForRemoteButton:)
+ withObject:buttonIdentifierNumber];
}
+ break;
+ case kRemoteButtonMenu:
+ [o_controls showPosition: self];
+ break;
+ default:
+ /* Add here whatever you want other buttons to do */
+ break;
+ }
+}
- p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if( p_aout != NULL )
- {
- vlc_value_t val;
-
- if( var_Get( (vlc_object_t *)p_aout, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_aout_update = 1;
- b_need_menus = VLC_TRUE;
- }
+- (char *)delocalizeString:(NSString *)id
+{
+ NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
+ allowLossyConversion: NO];
+ char * psz_string;
- vlc_object_release( (vlc_object_t *)p_aout );
- }
+ 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 the requested encoding: %s",
+ psz_string );
+ }
+ else
+ {
+ psz_string = malloc( [o_data length] + 1 );
+ [o_data getBytes: psz_string];
+ psz_string[ [o_data length] ] = '\0';
+ }
- aout_VolumeGet( p_intf, &i_volume );
- p_intf->p_sys->b_mute = ( i_volume == 0 );
+ return psz_string;
+}
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
- if( p_vout != NULL )
- {
- vlc_value_t val;
+/* 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];
- 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 = VLC_TRUE;
- }
+ return o_out_string;
+}
- vlc_object_release( (vlc_object_t *)p_vout );
- }
- if( b_need_menus )
- {
- [self setupMenus: p_input];
- }
- }
+/*****************************************************************************
+ * 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_libvlc->p_hotkeys;
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ 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];
+
+ switch( key )
+ {
+ case NSDeleteCharacter:
+ case NSDeleteFunctionKey:
+ case NSDeleteCharFunctionKey:
+ case NSBackspaceCharacter:
+ case NSUpArrowFunctionKey:
+ case NSDownArrowFunctionKey:
+ case NSRightArrowFunctionKey:
+ case NSLeftArrowFunctionKey:
+ case NSEnterCharacter:
+ case NSCarriageReturnCharacter:
+ return NO;
}
- 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 = 0;
- [self manageMode: p_playlist];
+ if( p_hotkeys[i].i_key == val.i_int )
+ {
+ var_Set( p_intf->p_libvlc, "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( o_controls )
+ return o_controls;
- if( p_playlist->p_input != NULL )
- {
- /* 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->b_current_title_update = 1;
- p_intf->p_sys->i_part = 0;
+ return nil;
+}
- p_playlist->p_input->stream.b_changed = 0;
-
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- }
- 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 );
+- (id)getSimplePreferences
+{
+ if( !o_sprefs )
+ return nil;
- vlc_mutex_unlock( &p_playlist->object_lock );
- vout_Destroy( p_vout );
- vlc_mutex_lock( &p_playlist->object_lock );
- }
- }
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ return o_sprefs;
}
-- (void)manageIntf:(NSTimer *)o_timer
+- (id)getPreferences
{
- intf_thread_t * p_intf = [NSApp getIntf];
+ if( !o_prefs )
+ return nil;
- if( p_intf->p_vlc->b_die == VLC_TRUE )
- {
- [o_timer invalidate];
- return;
- }
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ return o_prefs;
+}
- if( p_playlist == NULL )
- {
- return;
- }
+- (id)getPlaylist
+{
+ if( o_playlist )
+ return o_playlist;
- if ( p_intf->p_sys->b_playlist_update )
- {
- vlc_value_t val;
+ return nil;
+}
- val.b_bool = 0;
- var_Set( (vlc_object_t *)p_playlist, "intf-change", val );
+- (id)getInfo
+{
+ if( o_info )
+ return o_info;
- [o_playlist playlistUpdated];
+ return nil;
+}
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
- }
+- (id)getWizard
+{
+ if( o_wizard )
+ return o_wizard;
+
+ return nil;
+}
- if( p_intf->p_sys->b_current_title_update )
+- (id)getBookmarks
+{
+ if( o_bookmarks )
+ return o_bookmarks;
+
+ return nil;
+}
+
+- (id)getEmbeddedList
+{
+ if( o_embedded_list )
+ return o_embedded_list;
+
+ return nil;
+}
+
+- (id)getInteractionList
+{
+ if( o_interaction_list )
+ return o_interaction_list;
+
+ return nil;
+}
+
+- (id)getMainIntfPgbar
+{
+ if( o_main_pgbar )
+ return o_main_pgbar;
+
+ return nil;
+}
+
+- (id)getControllerWindow
+{
+ if( o_window )
+ return o_window;
+ return nil;
+}
+
+- (id)getVoutMenu
+{
+ return o_vout_menu;
+}
+
+- (id)getEyeTVController
+{
+ if( o_eyetv )
+ return o_eyetv;
+
+ return nil;
+}
+
+- (void)manage
+{
+ playlist_t * p_playlist;
+ input_thread_t * p_input = NULL;
+
+ /* new thread requires a new pool */
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+
+ vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+
+ p_playlist = pl_Yield( p_intf );
+
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
+ var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+
+ pl_Release( p_intf );
+
+ vlc_object_lock( p_intf );
+ while( vlc_object_alive( p_intf ) )
{
- id o_vout_wnd;
+ vlc_mutex_lock( &p_intf->change_lock );
- NSEnumerator * o_enum = [[NSApp windows] objectEnumerator];
-
- while( ( o_vout_wnd = [o_enum nextObject] ) )
+ if( !p_input )
{
- if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
+ p_input = playlist_CurrentInput( p_playlist );
+
+ /* Refresh the interface */
+ if( p_input )
{
- [o_vout_wnd updateTitle];
+ msg_Dbg( p_intf, "input has changed, refreshing interface" );
+ p_intf->p_sys->b_input_update = true;
}
}
+ else if( !vlc_object_alive (p_input) || p_input->b_dead )
+ {
+ /* input stopped */
+ p_intf->p_sys->b_intf_update = true;
+ p_intf->p_sys->i_play_status = END_S;
+ msg_Dbg( p_intf, "input has stopped, refreshing interface" );
+ vlc_object_release( p_input );
+ p_input = NULL;
+ }
- [o_playlist updateRowSelection];
- [o_info updateInfo];
+ /* Manage volume status */
+ [self manageVolumeSlider];
+
+ vlc_mutex_unlock( &p_intf->change_lock );
- p_intf->p_sys->b_current_title_update = FALSE;
+ vlc_object_timedwait( p_intf, 100000 + mdate());
}
+ vlc_object_unlock( p_intf );
+ [o_pool release];
- vlc_mutex_lock( &p_playlist->object_lock );
+ if( p_input ) vlc_object_release( p_input );
-#define p_input p_playlist->p_input
+ var_DelCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-append", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-deleted", PlaylistChanged, self );
- if( p_input != NULL )
+ pthread_testcancel(); /* If we were cancelled stop here */
+
+ msg_Dbg( p_intf, "Killing the Mac OS X module" );
+
+ /* We are dead, terminate */
+ [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO];
+}
+
+- (void)manageIntf:(NSTimer *)o_timer
+{
+ vlc_value_t val;
+ playlist_t * p_playlist;
+ input_thread_t * p_input;
+
+ if( p_intf->p_sys->b_input_update )
{
- vlc_mutex_lock( &p_input->stream.stream_lock );
+ /* Called when new input is opened */
+ p_intf->p_sys->b_current_title_update = true;
+ p_intf->p_sys->b_intf_update = true;
+ p_intf->p_sys->b_input_update = false;
+ [self setupMenus]; /* Make sure input menu is up to date */
}
-
if( p_intf->p_sys->b_intf_update )
{
- vlc_bool_t b_input = VLC_FALSE;
- vlc_bool_t b_plmul = VLC_FALSE;
- vlc_bool_t b_control = VLC_FALSE;
- vlc_bool_t b_seekable = VLC_FALSE;
- vlc_bool_t b_chapters = VLC_FALSE;
-
- b_plmul = p_playlist->i_size > 1;
-
+ bool b_input = false;
+ bool b_plmul = false;
+ bool b_control = false;
+ bool b_seekable = false;
+ bool b_chapters = false;
+
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ /* TODO: fix i_size use */
+ b_plmul = p_playlist->items.i_size > 1;
+
+ p_input = playlist_CurrentInput( p_playlist );
+ bool b_buffering = NO;
+
if( ( b_input = ( p_input != NULL ) ) )
{
/* seekable streams */
- b_seekable = p_input->stream.b_seekable;
+ int state = input_GetState( p_input );
+ if ( state == INIT_S ||
+ state == OPENING_S ||
+ state == BUFFERING_S )
+ {
+ b_buffering = YES;
+ }
+
+ /* seekable streams */
+ b_seekable = var_GetBool( p_input, "seekable" );
- /* control buttons for free pace streams */
- b_control = p_input->stream.b_pace_control;
+ /* check whether slow/fast motion is possible */
+ b_control = p_input->b_can_pace_control;
- /* chapters */
- b_chapters = p_input->stream.p_selected_area->i_part_nb > 1;
+ /* chapters & titles */
+ //b_chapters = p_input->stream.i_area_nb > 1;
+ vlc_object_release( p_input );
+ }
+ pl_Release( p_intf );
- /* play status */
- p_intf->p_sys->b_play_status =
- p_input->stream.control.i_status != PAUSE_S;
+ if( b_buffering )
+ {
+ [o_main_pgbar startAnimation:self];
+ [o_main_pgbar setIndeterminate:YES];
+ [o_main_pgbar setHidden:NO];
}
else
{
- /* play status */
- p_intf->p_sys->b_play_status = VLC_FALSE;
-
- [self setSubmenusEnabled: FALSE];
+ [o_main_pgbar stopAnimation:self];
+ [o_main_pgbar setHidden:YES];
}
- [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 setFloatValue: 0.0];
[o_timeslider setEnabled: b_seekable];
- [o_timefield setStringValue: @"0:00:00"];
+ [o_timefield setStringValue: @"00:00"];
+ [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"00:00"];
+ [[[self getControls] getFSPanel] setSeekable: b_seekable];
- [self manageVolumeSlider];
+ [o_embedded_window setSeekable: b_seekable];
+
+ p_intf->p_sys->b_current_title_update = true;
+
+ p_intf->p_sys->b_intf_update = false;
+ }
- p_intf->p_sys->b_intf_update = VLC_FALSE;
+ if( p_intf->p_sys->b_playmode_update )
+ {
+ [o_playlist playModeUpdated];
+ p_intf->p_sys->b_playmode_update = false;
+ }
+ if( p_intf->p_sys->b_playlist_update )
+ {
+ [o_playlist playlistUpdated];
+ p_intf->p_sys->b_playlist_update = false;
}
-#define p_area p_input->stream.p_selected_area
+ if( p_intf->p_sys->b_fullscreen_update )
+ {
+ p_intf->p_sys->b_fullscreen_update = false;
+ }
- if( p_intf->p_sys->b_playing && p_input != NULL )
+ if( p_intf->p_sys->b_intf_show )
{
- vlc_bool_t b_field_update = VLC_TRUE;
+ [o_window makeKeyAndOrderFront: self];
- 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;
+ p_intf->p_sys->b_intf_show = false;
+ }
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
- }
+ p_input = pl_CurrentInput( p_intf );
+ if( p_input && vlc_object_alive (p_input) )
+ {
+ 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 *aString;
+ input_item_t * p_item = input_GetItem( p_input );
+ char * name = input_item_GetNowPlaying( p_item );
- if( f_slider != f_updated )
- {
- [o_timeslider setFloatValue: f_updated];
- }
- }
- else
- {
- off_t i_seek = ( f_slider * p_area->i_size ) / 10000;
+ if( !name )
+ name = input_item_GetName( p_item );
- /* 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 );
+ aString = [NSString stringWithUTF8String:name];
- /* update the old value */
- f_slider_old = f_slider;
+ free(name);
- b_field_update = VLC_FALSE;
- }
+ [self setScrollField: aString stopAfter:-1];
+ [[[self getControls] getFSPanel] setStreamTitle: aString];
+
+ [[o_controls getVoutView] updateTitle];
+
+ [o_playlist updateRowSelection];
+ p_intf->p_sys->b_current_title_update = FALSE;
}
- if( b_field_update )
+ if( [o_timeslider isEnabled] )
{
+ /* Update the slider */
+ vlc_value_t time;
NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
+ vlc_value_t pos;
+ char psz_time[MSTRTIME_MAX_SIZE];
+ float f_updated;
+
+ var_Get( p_input, "position", &pos );
+ f_updated = 10000. * pos.f_float;
+ [o_timeslider setFloatValue: f_updated];
- input_OffsetToTime( p_input, psz_time, p_area->i_tell );
+ var_Get( p_input, "time", &time );
+
+ o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
- o_time = [NSString stringWithCString: psz_time];
[o_timefield setStringValue: o_time];
+ [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
+ [o_embedded_window setTime: o_time position: f_updated];
}
- /* disable screen saver */
- UpdateSystemActivity( UsrActivity );
+ /* 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];
+ [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
+ }
+ vlc_object_release( p_input );
+ }
+ else if( p_input )
+ {
+ vlc_object_release( p_input );
}
+ else
+ {
+ p_intf->p_sys->i_play_status = END_S;
+ [self playStatusUpdated: p_intf->p_sys->i_play_status];
+ [o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
+ [self setSubmenusEnabled: FALSE];
+ }
+
+ if( p_intf->p_sys->b_volume_update )
+ {
+ NSString *o_text;
+ int i_volume_step = 0;
+ o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
+ if( i_lastShownVolume != -1 )
+ [self setScrollField:o_text stopAfter:1000000];
+ i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
+ [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
+ [o_volumeslider setEnabled: TRUE];
+ [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
+ p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
+ p_intf->p_sys->b_volume_update = FALSE;
+ }
+
+end:
+ [self updateMessageArray];
+
+ if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
+ [self resetScrollField];
+
+ [interfaceTimer autorelease];
-#undef p_area
+ interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.3
+ target: self selector: @selector(manageIntf:)
+ userInfo: nil repeats: FALSE] retain];
+}
+- (void)setupMenus
+{
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = playlist_CurrentInput( p_playlist );
if( p_input != NULL )
{
- vlc_mutex_unlock( &p_input->stream.stream_lock );
+ [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 )
+ {
+ vlc_object_t * p_dec_obj;
+
+ [o_controls setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)p_vout
+ var: "aspect-ratio" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_crop target: (vlc_object_t *) p_vout
+ var: "crop" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
+ var: "video-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
+ var: "deinterlace" selector: @selector(toggleVar:)];
+
+ p_dec_obj = (vlc_object_t *)vlc_object_find(
+ (vlc_object_t *)p_vout,
+ VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if( p_dec_obj != NULL )
+ {
+ [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
+ (vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
+ @selector(toggleVar:)];
+
+ vlc_object_release(p_dec_obj);
+ }
+ vlc_object_release( (vlc_object_t *)p_vout );
+ }
+ vlc_object_release( p_input );
}
+ pl_Release( p_intf );
+}
-#undef p_input
+- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
+{
+ int x,y = 0;
+ vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ if(! p_vout )
+ return;
+
+ /* clean the menu before adding new entries */
+ if( [o_mi_screen hasSubmenu] )
+ {
+ y = [[o_mi_screen submenu] numberOfItems] - 1;
+ msg_Dbg( VLCIntf, "%i items in submenu", y );
+ while( x != y )
+ {
+ msg_Dbg( VLCIntf, "removing item %i of %i", x, y );
+ [[o_mi_screen submenu] removeItemAtIndex: x];
+ x++;
+ }
+ }
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
+ var: "video-device" selector: @selector(toggleVar:)];
+ vlc_object_release( (vlc_object_t *)p_vout );
+}
- [self updateMessageArray];
+- (void)setScrollField:(NSString *)o_string stopAfter:(int)timeout
+{
+ if( timeout != -1 )
+ i_end_scroll = mdate() + timeout;
+ else
+ i_end_scroll = -1;
+ [o_scrollfield setStringValue: o_string];
+}
- [NSTimer scheduledTimerWithTimeInterval: 0.5
- target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE];
+- (void)resetScrollField
+{
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = playlist_CurrentInput( p_playlist );
+
+ i_end_scroll = -1;
+ if( p_input && vlc_object_alive (p_input) )
+ {
+ NSString *o_temp;
+ if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
+ o_temp = [NSString stringWithUTF8String:
+ input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )];
+ else
+ o_temp = [NSString stringWithUTF8String:
+ p_playlist->status.p_item->p_input->psz_name];
+ [self setScrollField: o_temp stopAfter:-1];
+ [[[self getControls] getFSPanel] setStreamTitle: o_temp];
+ vlc_object_release( p_input );
+ pl_Release( p_intf );
+ return;
+ }
+ pl_Release( p_intf );
+ [self setScrollField: _NS("VLC media player") stopAfter:-1];
}
- (void)updateMessageArray
{
int i_start, i_stop;
- intf_thread_t * p_intf = [NSApp getIntf];
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
i_stop = *p_intf->p_sys->p_sub->pi_stop;
[o_msg_arr addObject: [o_msg_color autorelease]];
[o_msg_lock unlock];
-
- if( i_type == 1 )
- {
- NSString *o_my_msg = [NSString stringWithFormat: @"%s: %s\n",
- p_intf->p_sys->p_sub->p_msg[i_start].psz_module,
- p_intf->p_sys->p_sub->p_msg[i_start].psz_msg];
-
- NSRange s_r = NSMakeRange( [[o_err_msg string] length], 0 );
- [o_err_msg setEditable: YES];
- [o_err_msg setSelectedRange: s_r];
- [o_err_msg insertText: o_my_msg];
-
- [o_error makeKeyAndOrderFront: self];
- [o_err_msg setEditable: NO];
- }
}
vlc_mutex_lock( p_intf->p_sys->p_sub->p_lock );
}
}
-- (void)playStatusUpdated:(BOOL)b_pause
+- (void)playStatusUpdated:(int)i_status
{
- if( b_pause )
+ if( i_status == PLAYING_S )
{
+ [[[self getControls] getFSPanel] setPause];
[o_btn_play setImage: o_img_pause];
+ [o_btn_play setAlternateImage: o_img_pause_pressed];
[o_btn_play setToolTip: _NS("Pause")];
[o_mi_play setTitle: _NS("Pause")];
[o_dmi_play setTitle: _NS("Pause")];
+ [o_vmi_play setTitle: _NS("Pause")];
}
else
{
+ [[[self getControls] getFSPanel] setPlay];
[o_btn_play setImage: o_img_play];
+ [o_btn_play setAlternateImage: o_img_play_pressed];
[o_btn_play setToolTip: _NS("Play")];
[o_mi_play setTitle: _NS("Play")];
[o_dmi_play setTitle: _NS("Play")];
+ [o_vmi_play setTitle: _NS("Play")];
}
}
[o_mi_program setEnabled: b_enabled];
[o_mi_title setEnabled: b_enabled];
[o_mi_chapter setEnabled: b_enabled];
- [o_mi_language 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_ffmpeg_pp setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled];
+ [o_mi_aspect_ratio setEnabled: b_enabled];
+ [o_mi_crop setEnabled: b_enabled];
}
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
- intf_thread_t * p_intf = [NSApp getIntf];
-
aout_VolumeGet( p_intf, &i_volume );
- [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
- [o_volumeslider setEnabled: 1];
-
- p_intf->p_sys->b_mute = ( i_volume == 0 );
-}
-
-- (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 )) )
+ if( i_volume != i_lastShownVolume )
{
- vlc_object_detach( p_playlist );
- vlc_object_release( p_playlist );
- playlist_Destroy( p_playlist );
+ i_lastShownVolume = i_volume;
+ p_intf->p_sys->b_volume_update = TRUE;
}
-
- /*
- * 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 )) )
- {
- vlc_object_detach( p_vout );
- vlc_object_release( p_vout );
- vout_Destroy( p_vout );
- }
-
- if( o_img_pause != nil )
- {
- [o_img_pause release];
- o_img_pause = nil;
- }
-
- if( o_img_play != nil )
- {
- [o_img_play release];
- o_img_play = nil;
- }
-
- if( o_msg_arr != nil )
- {
- [o_msg_arr removeAllObjects];
- [o_msg_arr release];
- o_msg_arr = nil;
- }
-
- if( o_msg_lock != nil )
- {
- [o_msg_lock release];
- o_msg_lock = nil;
- }
-
- if( o_prefs != nil )
- {
- [o_prefs release];
- o_prefs = 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];
}
-- (void)setupMenus:(input_thread_t *)p_input
-{
- 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;
-
- if( p_intf->p_sys->b_program_update )
- {
- NSMenu * o_program;
- SEL pf_toggle_program;
- pgrm_descriptor_t * p_pgrm;
-
- if( p_input->stream.p_new_program )
- {
- p_pgrm = p_input->stream.p_new_program;
- }
- 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];
- }
-
- /* make (un)sensitive */
- [o_mi_program setEnabled:
- p_input->stream.i_pgrm_number > 1];
-
- /* 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';
-
- o_menu_title = [NSApp localizedString: psz_title];
-
- 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];
-
- if( p_pgrm == p_input->stream.pp_programs[i] )
- {
- [o_item setState: NSOnState];
- }
- }
-
- p_intf->p_sys->b_program_update = 0;
- }
-
- 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];
- }
-
- /* make (un)sensitive */
- [o_mi_title setEnabled:
- p_input->stream.i_area_nb > 1];
-
- /* add title items */
- for( i = 1 ; i < p_input->stream.i_area_nb ; i++ )
- {
- 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';
-
- o_menu_title = [NSApp localizedString: psz_title];
-
- o_item = [o_title addItemWithTitle: o_menu_title
- action: pf_toggle_title keyEquivalent: @""];
- [o_item setTag: i];
- [o_item setTarget: o_controls];
+- (IBAction)timesliderUpdate:(id)sender
+{
+ float f_updated;
+ playlist_t * p_playlist;
+ input_thread_t * p_input;
- if( ( p_input->stream.pp_areas[i] ==
- p_input->stream.p_selected_area ) )
- {
- [o_item setState: NSOnState];
- }
- }
+ switch( [[NSApp currentEvent] type] )
+ {
+ case NSLeftMouseUp:
+ case NSLeftMouseDown:
+ case NSLeftMouseDragged:
+ f_updated = [sender floatValue];
+ break;
- p_intf->p_sys->b_title_update = 0;
+ default:
+ return;
}
-
- if( p_intf->p_sys->b_chapter_update )
+ p_playlist = pl_Yield( p_intf );
+ p_input = playlist_CurrentInput( p_playlist );
+ if( p_input != NULL )
{
- NSMenu * o_chapter;
- SEL pf_toggle_chapter;
+ vlc_value_t time;
+ vlc_value_t pos;
+ NSString * o_time;
+ char psz_time[MSTRTIME_MAX_SIZE];
- o_chapter = [o_mi_chapter submenu];
- pf_toggle_chapter = @selector(toggleChapter:);
+ pos.f_float = f_updated / 10000.;
+ var_Set( p_input, "position", pos );
+ [o_timeslider setFloatValue: f_updated];
- /* remove previous chapter items */
- i_nb_items = [o_chapter numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
- {
- [o_chapter removeItemAtIndex: 0];
- }
+ var_Get( p_input, "time", &time );
- /* make (un)sensitive */
- [o_mi_chapter setEnabled:
- p_input->stream.p_selected_area->i_part_nb > 1];
+ o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
+ [o_timefield setStringValue: o_time];
+ [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
+ [o_embedded_window setTime: o_time position: f_updated];
+ vlc_object_release( p_input );
+ }
+ pl_Release( p_intf );
+}
- /* 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';
+- (void)applicationWillTerminate:(NSNotification *)notification
+{
+ playlist_t * p_playlist;
+ vout_thread_t * p_vout;
+ int returnedValue = 0;
+
+ msg_Dbg( p_intf, "Terminating" );
- o_menu_title = [NSApp localizedString: psz_title];
+ /* Make sure the manage_thread won't call -terminate: again */
+ pthread_cancel( manage_thread );
- o_item = [o_chapter addItemWithTitle: o_menu_title
- action: pf_toggle_chapter keyEquivalent: @""];
- [o_item setTag: i + 1];
- [o_item setTarget: o_controls];
+ /* Make sure the intf object is getting killed */
+ vlc_object_kill( p_intf );
- if( ( p_input->stream.p_selected_area->i_part == i + 1 ) )
- {
- [o_item setState: NSOnState];
- }
- }
+ /* Make sure our manage_thread ends */
+ pthread_join( manage_thread, NULL );
- p_intf->p_sys->i_part =
- p_input->stream.p_selected_area->i_part;
+ /* Make sure the interfaceTimer is destroyed */
+ [interfaceTimer invalidate];
+ [interfaceTimer release];
+ interfaceTimer = nil;
- p_intf->p_sys->b_chapter_update = 0;
- }
+ /* make sure that the current volume is saved */
+ config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );
+ returnedValue = config_SaveConfigFile( p_intf->p_libvlc, "main" );
+ if( returnedValue != 0 )
+ msg_Err( p_intf,
+ "error while saving volume in osx's terminate method (%i)",
+ returnedValue );
- for( i = 0 ; i < p_input->stream.i_selected_es_number ; i++ )
+ /* save the prefs if they were changed in the extended panel */
+ if(o_extended && [o_extended getConfigChanged])
{
- 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_extended savePrefs];
}
+
+ p_intf->b_interaction = false;
+ var_DelCallback( p_intf, "interaction", InteractCallback, self );
- if( p_intf->p_sys->b_audio_update )
- {
- [self setupLangMenu: p_input mi: o_mi_language es: p_audio_es
- category: AUDIO_ES selector: @selector(toggleLanguage:)];
-
- p_intf->p_sys->b_audio_update = 0;
- }
+ /* remove global observer watching for vout device changes correctly */
+ [[NSNotificationCenter defaultCenter] removeObserver: self];
- if( p_intf->p_sys->b_spu_update )
- {
- [self setupLangMenu: p_input mi: o_mi_subtitle es: p_spu_es
- category: SPU_ES selector: @selector(toggleLanguage:)];
+ /* release some other objects here, because it isn't sure whether dealloc
+ * will be called later on */
- p_intf->p_sys->b_spu_update = 0;
- }
+ if( nib_about_loaded )
+ [o_about release];
- if ( p_intf->p_sys->b_aout_update )
+ if( nib_prefs_loaded )
{
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
+ [o_sprefs release];
+ [o_prefs release];
+ }
- if ( p_aout != NULL )
- {
- vlc_value_t val;
- val.b_bool = 0;
+ if( nib_open_loaded )
+ [o_open release];
- var_Set( (vlc_object_t *)p_aout, "intf-change", val );
+ if( nib_extended_loaded )
+ {
+ [o_extended release];
+ }
- [self setupVarMenu: o_mi_channels target: (vlc_object_t *)p_aout
- var: "audio-channels" selector: @selector(toggleVar:)];
+ if( nib_bookmarks_loaded )
+ [o_bookmarks release];
- [self setupVarMenu: o_mi_device target: (vlc_object_t *)p_aout
- var: "audio-device" selector: @selector(toggleVar:)];
+ if( o_info )
+ {
+ [o_info stopTimers];
+ [o_info release];
+ }
- vlc_object_release( (vlc_object_t *)p_aout );
- }
+ if( nib_wizard_loaded )
+ [o_wizard release];
+
+ [o_embedded_list release];
+ [o_interaction_list release];
+ [o_eyetv release];
- p_intf->p_sys->b_aout_update = 0;
- }
+ [o_img_pause_pressed release];
+ [o_img_play_pressed release];
+ [o_img_pause release];
+ [o_img_play release];
- if( p_intf->p_sys->b_vout_update )
- {
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
+ [o_msg_arr removeAllObjects];
+ [o_msg_arr release];
- if ( p_vout != NULL )
- {
- vlc_value_t val;
- val.b_bool = 0;
+ [o_msg_lock release];
- var_Set( (vlc_object_t *)p_vout, "intf-change", val );
+ /* write cached user defaults to disk */
+ [[NSUserDefaults standardUserDefaults] synchronize];
- [self setupVarMenu: o_mi_screen target: (vlc_object_t *)p_vout
- var: "video-device" selector: @selector(toggleVar:)];
+ /* Kill the playlist, so that it doesn't accept new request
+ * such as the play request from vlc.c (we are a blocking interface). */
+ p_playlist = pl_Yield( p_intf );
+ vlc_object_kill( p_playlist );
+ pl_Release( p_intf );
- vlc_object_release( (vlc_object_t *)p_vout );
+ vlc_object_kill( p_intf->p_libvlc );
- [o_mi_close_window setEnabled: TRUE];
- }
+ /* Go back to Run() and make libvlc exit properly */
+ if( jmpbuffer )
+ longjmp( jmpbuffer, 1 );
+ /* not reached */
+}
- p_intf->p_sys->b_vout_update = 0;
- }
-#undef p_input
+- (IBAction)clearRecentItems:(id)sender
+{
+ [[NSDocumentController sharedDocumentController]
+ clearRecentDocuments: nil];
}
-- (void)setupLangMenu:(input_thread_t *)p_input
- mi:(NSMenuItem *)o_mi
- es:(es_descriptor_t *)p_es
- category:(int)i_cat
- selector:(SEL)pf_callback
+- (void)openRecentItem:(id)sender
{
- unsigned int i, i_nb_items;
- NSMenu * o_menu = [o_mi submenu];
+ [self application: nil openFile: [sender title]];
+}
- /* remove previous language items */
- i_nb_items = [o_menu numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
+- (IBAction)intfOpenFile:(id)sender
+{
+ if( !nib_open_loaded )
{
- [o_menu removeItemAtIndex: 0];
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openFile];
+ } else {
+ [o_open openFile];
}
+}
- /* 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];
+- (IBAction)intfOpenFileGeneric:(id)sender
+{
+ if( !nib_open_loaded )
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openFileGeneric];
+ } else {
+ [o_open openFileGeneric];
}
-#endif
+}
-#define ES p_input->stream.pp_es[i]
- for( i = 0 ; i < p_input->stream.i_es_number ; i++ )
+- (IBAction)intfOpenDisc:(id)sender
+{
+ if( !nib_open_loaded )
{
- if( ( ES->i_cat == i_cat ) &&
- ( !ES->p_pgrm ||
- ES->p_pgrm ==
- p_input->stream.p_selected_program ) )
- {
- NSMenuItem * o_lmi;
- NSString * o_title;
-
- if( *ES->psz_desc )
- {
- o_title = [NSApp localizedString: 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 = [NSApp localizedString: 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];
- }
- }
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openDisc];
+ } else {
+ [o_open openDisc];
}
-#undef ES
}
-- (void)setupVarMenu:(NSMenuItem *)o_mi
- target:(vlc_object_t *)p_object
- var:(const char *)psz_variable
- selector:(SEL)pf_callback
+- (IBAction)intfOpenNet:(id)sender
{
- int i, i_nb_items, i_value;
- NSMenu * o_menu = [o_mi submenu];
- vlc_value_t val, text;
-
- [o_mi setTag: (int)psz_variable];
-
- /* remove previous items */
- i_nb_items = [o_menu numberOfItems];
- for( i = 0; i < i_nb_items; i++ )
+ if( !nib_open_loaded )
{
- [o_menu removeItemAtIndex: 0];
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openNet];
+ } else {
+ [o_open openNet];
}
+}
- if ( var_Get( p_object, psz_variable, &val ) < 0 )
+- (IBAction)intfOpenCapture:(id)sender
+{
+ if( !nib_open_loaded )
{
- return;
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openCapture];
+ } else {
+ [o_open openCapture];
}
- i_value = val.i_int;
+}
- if ( var_Change( p_object, psz_variable,
- VLC_VAR_GETLIST, &val, &text ) < 0 )
+- (IBAction)showWizard:(id)sender
+{
+ if( !nib_wizard_loaded )
{
- return;
+ nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+ [o_wizard initStrings];
+ [o_wizard resetWizard];
+ [o_wizard showWizard];
+ } else {
+ [o_wizard resetWizard];
+ [o_wizard showWizard];
}
+}
- /* make (un)sensitive */
- [o_mi setEnabled: ( val.p_list->i_count > 0 )];
-
- for ( i = 0; i < val.p_list->i_count; i++ )
- {
- NSMenuItem * o_lmi;
- NSString * o_title;
+- (IBAction)showExtended:(id)sender
+{
+ if( o_extended == nil )
+ o_extended = [[VLCExtended alloc] init];
- o_title = [NSApp localizedString: text.p_list->p_values[i].psz_string];
+ if( !nib_extended_loaded )
+ nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
- o_lmi = [o_menu addItemWithTitle: [o_title copy]
- action: pf_callback keyEquivalent: @""];
-
- /* FIXME: this isn't 64-bit clean ! */
- [o_lmi setTag: val.p_list->p_values[i].i_int];
- [o_lmi setRepresentedObject:
- [NSValue valueWithPointer: p_object]];
- [o_lmi setTarget: o_controls];
+ [o_extended showPanel];
+}
- if ( i_value == val.p_list->p_values[i].i_int )
- [o_lmi setState: NSOnState];
+- (IBAction)showBookmarks:(id)sender
+{
+ /* we need the wizard-nib for the bookmarks's extract functionality */
+ if( !nib_wizard_loaded )
+ {
+ nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+ [o_wizard initStrings];
}
+
+ if( !nib_bookmarks_loaded )
+ nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
- var_Change( p_object, psz_variable, VLC_VAR_FREELIST,
- &val, &text );
-
+ [o_bookmarks showBookmarks];
}
-- (IBAction)clearRecentItems:(id)sender
+- (IBAction)viewAbout:(id)sender
{
- [[NSDocumentController sharedDocumentController]
- clearRecentDocuments: nil];
+ if( !nib_about_loaded )
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+
+ [o_about showAbout];
}
-- (void)openRecentItem:(id)sender
+- (IBAction)showLicense:(id)sender
{
- [self application: nil openFile: [sender title]];
-}
+ if( !nib_about_loaded )
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+ [o_about showGPL: sender];
+}
+
- (IBAction)viewPreferences:(id)sender
{
- if( o_prefs == nil )
+ if( !nib_prefs_loaded )
{
- o_prefs = [[VLCPrefs alloc] init];
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
+ o_sprefs = [[VLCSimplePrefs alloc] init];
+ o_prefs= [[VLCPrefs alloc] init];
}
- [o_prefs createPrefPanel: @"main"];
+ [o_sprefs showSimplePrefs];
}
-- (IBAction)timesliderUpdate:(id)sender
+- (IBAction)checkForUpdate:(id)sender
{
- float f_updated;
+#ifdef UPDATE_CHECK
+ if( !nib_update_loaded )
+ nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
+ [o_update showUpdateWindow];
+#else
+ msg_Err( VLCIntf, "Update checker wasn't enabled in this build" );
+ intf_UserFatal( VLCIntf, false, _("Update check failed"), _("Checking for updates was not enabled in this build.") );
+#endif
+}
- switch( [[NSApp currentEvent] type] )
+- (IBAction)viewHelp:(id)sender
+{
+ if( !nib_about_loaded )
{
- case NSLeftMouseUp:
- case NSLeftMouseDown:
- f_slider = [sender floatValue];
- return;
-
- case NSLeftMouseDragged:
- f_updated = [sender floatValue];
- break;
-
- default:
- return;
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+ [o_about showHelp];
}
+ else
+ [o_about showHelp];
+}
- intf_thread_t * p_intf = [NSApp getIntf];
+- (IBAction)openReadMe:(id)sender
+{
+ NSString * o_path = [[NSBundle mainBundle]
+ pathForResource: @"README.MacOSX" ofType: @"rtf"];
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
+ [[NSWorkspace sharedWorkspace] openFile: o_path
+ withApplication: @"TextEdit"];
+}
- if( p_playlist == NULL )
- {
- return;
- }
+- (IBAction)openDocumentation:(id)sender
+{
+ NSURL * o_url = [NSURL URLWithString:
+ @"http://www.videolan.org/doc/"];
- vlc_mutex_lock( &p_playlist->object_lock );
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
+}
- if( p_playlist->p_input != NULL )
- {
- off_t i_tell;
- NSString * o_time;
- char psz_time[ OFFSETTOTIME_MAX_SIZE ];
+- (IBAction)openWebsite:(id)sender
+{
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
-#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
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
+}
- o_time = [NSString stringWithCString: psz_time];
- [o_timefield setStringValue: o_time];
- }
+- (IBAction)openForum:(id)sender
+{
+ NSURL * o_url = [NSURL URLWithString: @"http://forum.videolan.org/"];
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
}
-- (IBAction)closeError:(id)sender
+- (IBAction)openDonate:(id)sender
{
- [o_err_msg setString: @""];
- [o_error performClose: self];
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/contribute.html#paypal"];
+
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
}
-- (IBAction)openReadMe:(id)sender
+#pragma mark Crash Log
+- (void)mailCrashLog:(NSString *)crashLog withUserComment:(NSString *)userComment
{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"README.MacOSX" ofType: @"rtf"];
+ static char mail[] =
+ "From: vlcuser <vlcuser@videolan.org>\n"
+ "To: VideoLAN Crash Report <apple-bugreport@videolan.org>\n"
+ "Subject: %@\n"
+ "Content-Type: text/plain; charset=ISO-8859-1; format=flowed\n"
+ "Content-Transfer-Encoding: 7bit\n"
+ "\n"
+ "%@\n\n"
+ "User Comment:\n%@\n--------------\n"
+ "\n"
+ "Crash log:\n%@\n--------------\n"
+ "\n"
+ "\n";
+ NSString * mailPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"vlc_crash_mail.eml"];
+ NSString * mailContent = [NSString stringWithFormat:[NSString stringWithUTF8String:mail],
+ _NS("Crash Report (Type Command-shift-D and hit send)"),
+ _NS("Type Command-shift-D (or in Menu \"Message\">\"Send Again\") and hit the \"Send Mail\" button."),
+ userComment, crashLog];
+ BOOL ret = [mailContent writeToFile:mailPath atomically:YES encoding:NSUTF8StringEncoding error:nil];
+ if( !ret )
+ {
+ NSRunAlertPanel(_NS("Error when generating crash report mail."), _NS("Can't prepare crash log mail"), _NS("OK"), nil, nil, nil );
+ return;
+ }
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"TextEdit"];
+ [[NSWorkspace sharedWorkspace] openFile:mailPath];
}
-- (IBAction)reportABug:(id)sender
+
+- (NSString *)latestCrashLogPathPreviouslySeen:(BOOL)previouslySeen
{
- NSURL * o_url = [NSURL URLWithString:
- @"http://www.videolan.org/support/bug-reporting.html"];
+ NSString * crashReporter = [@"~/Library/Logs/CrashReporter" stringByExpandingTildeInPath];
+ NSDirectoryEnumerator *direnum = [[NSFileManager defaultManager] enumeratorAtPath:crashReporter];
+ NSString *fname;
+ NSString * latestLog = nil;
+ NSInteger year = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0;
+ NSInteger month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0;
+ NSInteger day = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"] : 0;
+ NSInteger hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0;
+
+ while (fname = [direnum nextObject])
+ {
+ [direnum skipDescendents];
+ if([fname hasPrefix:@"VLC"] && [fname hasSuffix:@"crash"])
+ {
+ NSArray * compo = [fname componentsSeparatedByString:@"_"];
+ if( [compo count] < 3 ) continue;
+ compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"];
+ if( [compo count] < 4 ) continue;
+
+ // Dooh. ugly.
+ if( year < [[compo objectAtIndex:0] intValue] ||
+ (year ==[[compo objectAtIndex:0] intValue] &&
+ (month < [[compo objectAtIndex:1] intValue] ||
+ (month ==[[compo objectAtIndex:1] intValue] &&
+ (day < [[compo objectAtIndex:2] intValue] ||
+ (day ==[[compo objectAtIndex:2] intValue] &&
+ hours < [[compo objectAtIndex:3] intValue] ))))))
+ {
+ year = [[compo objectAtIndex:0] intValue];
+ month = [[compo objectAtIndex:1] intValue];
+ day = [[compo objectAtIndex:2] intValue];
+ hours = [[compo objectAtIndex:3] intValue];
+ latestLog = [crashReporter stringByAppendingPathComponent:fname];
+ }
+ }
+ }
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ if(!(latestLog && [[NSFileManager defaultManager] fileExistsAtPath:latestLog]))
+ return nil;
+
+ if( !previouslySeen )
+ {
+ [[NSUserDefaults standardUserDefaults] setInteger:year forKey:@"LatestCrashReportYear"];
+ [[NSUserDefaults standardUserDefaults] setInteger:month forKey:@"LatestCrashReportMonth"];
+ [[NSUserDefaults standardUserDefaults] setInteger:day forKey:@"LatestCrashReportDay"];
+ [[NSUserDefaults standardUserDefaults] setInteger:hours forKey:@"LatestCrashReportHours"];
+ }
+ return latestLog;
}
-- (IBAction)openWebsite:(id)sender
+- (NSString *)latestCrashLogPath
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org"];
-
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ return [self latestCrashLogPathPreviouslySeen:YES];
}
-- (IBAction)openLicense:(id)sender
+- (void)lookForCrashLog
{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"COPYING" ofType: nil];
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"TextEdit"];
+ // This pref key doesn't exists? this VLC is an upgrade, and this crash log come from previous version
+ BOOL areCrashLogsTooOld = ![[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"];
+ NSString * latestLog = [self latestCrashLogPathPreviouslySeen:NO];
+ if( latestLog && !areCrashLogsTooOld )
+ [self performSelectorOnMainThread:@selector(notifyCrashLogToUser:) withObject:latestLog waitUntilDone:NO];
+
+ [pool release];
}
-- (IBAction)openCrashLog:(id)sender
+- (void)notifyCrashLogToUser:(NSString *)crashLogPath
{
- NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
- stringByExpandingTildeInPath];
+ int ret = NSRunInformationalAlertPanel(_NS("VLC has previously crashed"),
+ _NS("VLC has previously crashed, do you want to send an email with the crash to VLC's team?"),
+ _NS("Send"), _NS("Don't Send"), nil, nil);
+ if( ret == NSAlertDefaultReturn )
+ {
+ [self mailCrashLog:[NSString stringWithContentsOfFile:crashLogPath] withUserComment:_NS("<Explain here what you were doing when VLC crashed, with possibly a link to the failing video>")];
+ }
+}
-
- if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
+- (IBAction)openCrashLog:(id)sender
+{
+ NSString * latestLog = [self latestCrashLogPath];
+ if( latestLog )
{
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"Console"];
+ [[NSWorkspace sharedWorkspace] openFile: latestLog 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.") );
-
+ NSBeginInformationalAlertSheet(_NS("No CrashLog found"), _NS("Continue"), nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
}
}
+#pragma mark -
+
+- (IBAction)viewErrorsAndWarnings:(id)sender
+{
+ [[[self getInteractionList] getErrorPanel] showPanel];
+}
+
+- (IBAction)showMessagesPanel:(id)sender
+{
+ [o_msgs_panel makeKeyAndOrderFront: sender];
+}
+
+- (IBAction)showInformationPanel:(id)sender
+{
+ if(! nib_info_loaded )
+ nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self];
+
+ [o_info initPanel];
+}
+
- (void)windowDidBecomeKey:(NSNotification *)o_notification
{
if( [o_notification object] == o_msgs_panel )
id o_msg;
NSEnumerator * o_enum;
- [o_messages setString: @""];
+ [o_messages setString: @""];
[o_msg_lock lock];
}
}
+#pragma mark Playlist toggling
+
+- (IBAction)togglePlaylist:(id)sender
+{
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ NSRect o_rect = [o_window contentRectForFrameRect:[o_window frame]];
+ /*First, check if the playlist is visible*/
+ if( contentRect.size.height <= 169. )
+ {
+ o_restore_rect = contentRect;
+ b_restore_size = true;
+ b_small_window = YES; /* we know we are small, make sure this is actually set (see case below) */
+
+ /* make large */
+ if( o_size_with_playlist.height > 169. )
+ o_rect.size.height = o_size_with_playlist.height;
+ else
+ o_rect.size.height = 500.;
+
+ if( o_size_with_playlist.width >= [o_window contentMinSize].width )
+ o_rect.size.width = o_size_with_playlist.width;
+ else
+ o_rect.size.width = [o_window contentMinSize].width;
+
+ o_rect.origin.x = contentRect.origin.x;
+ o_rect.origin.y = contentRect.origin.y - o_rect.size.height +
+ [o_window contentMinSize].height;
+
+ o_rect = [o_window frameRectForContentRect:o_rect];
+
+ NSRect screenRect = [[o_window screen] visibleFrame];
+ if( !NSContainsRect( screenRect, o_rect ) ) {
+ if( NSMaxX(o_rect) > NSMaxX(screenRect) )
+ o_rect.origin.x = ( NSMaxX(screenRect) - o_rect.size.width );
+ if( NSMinY(o_rect) < NSMinY(screenRect) )
+ o_rect.origin.y = ( NSMinY(screenRect) );
+ }
+
+ [o_btn_playlist setState: YES];
+ }
+ else
+ {
+ NSSize curSize = o_rect.size;
+ if( b_restore_size )
+ {
+ o_rect = o_restore_rect;
+ if( o_rect.size.height < [o_window contentMinSize].height )
+ o_rect.size.height = [o_window contentMinSize].height;
+ if( o_rect.size.width < [o_window contentMinSize].width )
+ o_rect.size.width = [o_window contentMinSize].width;
+ }
+ else
+ {
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ /* make small */
+ o_rect.size.height = [o_window contentMinSize].height;
+ o_rect.size.width = [o_window contentMinSize].width;
+ o_rect.origin.x = contentRect.origin.x;
+ /* Calculate the position of the lower right corner after resize */
+ o_rect.origin.y = contentRect.origin.y +
+ contentRect.size.height - [o_window contentMinSize].height;
+ }
+
+ [o_playlist_view setAutoresizesSubviews: NO];
+ [o_playlist_view removeFromSuperview];
+ [o_btn_playlist setState: NO];
+ b_small_window = NO; /* we aren't small here just yet. we are doing an animated resize after this */
+ o_rect = [o_window frameRectForContentRect:o_rect];
+ }
+
+ [o_window setFrame: o_rect display:YES animate: YES];
+}
+
+- (void)updateTogglePlaylistState
+{
+ if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. )
+ {
+ [o_btn_playlist setState: NO];
+ }
+ else
+ {
+ [o_btn_playlist setState: YES];
+ }
+}
+
+- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
+{
+
+ /* Not triggered on a window resize or maxification of the window. only by window mouse dragging resize */
+
+ /*Stores the size the controller one resize, to be able to restore it when
+ toggling the playlist*/
+ o_size_with_playlist = proposedFrameSize;
+
+ NSRect rect;
+ rect.size = proposedFrameSize;
+ if( [o_window contentRectForFrameRect:rect].size.height <= 169. )
+ {
+ if( b_small_window == NO )
+ {
+ /* if large and going to small then hide */
+ b_small_window = YES;
+ [o_playlist_view setAutoresizesSubviews: NO];
+ [o_playlist_view removeFromSuperview];
+ }
+ return NSMakeSize( proposedFrameSize.width, [o_window minSize].height);
+ }
+ return proposedFrameSize;
+}
+
+- (void)windowDidMove:(NSNotification *)notif
+{
+ b_restore_size = false;
+}
+
+- (void)windowDidResize:(NSNotification *)notif
+{
+ if( [o_window frame].size.height > 200 && b_small_window )
+ {
+ /* If large and coming from small then show */
+ [o_playlist_view setAutoresizesSubviews: YES];
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )];
+ [o_playlist_view setNeedsDisplay:YES];
+ [[o_window contentView] addSubview: o_playlist_view];
+ b_small_window = NO;
+ }
+ [self updateTogglePlaylistState];
+}
+
+#pragma mark -
+
@end
@implementation VLCMain (NSMenuValidation)
- (BOOL)validateMenuItem:(NSMenuItem *)o_mi
{
+ NSString *o_title = [o_mi title];
BOOL bEnabled = TRUE;
/* Recent Items Menu */
-
- if( [[o_mi title] isEqualToString: _NS("Clear Menu")] )
+ if( [o_title isEqualToString: _NS("Clear Menu")] )
{
NSMenu * o_menu = [o_mi_open_recent submenu];
int i_nb_items = [o_menu numberOfItems];
[o_menu insertItemWithTitle: o_doc
action: @selector(openRecentItem:)
- keyEquivalent: @"" atIndex: 0];
+ keyEquivalent: @"" atIndex: 0];
if( i_nb_docs == 0 )
{
break;
}
- }
+ }
}
else
{
bEnabled = FALSE;
}
}
-
return( bEnabled );
}
NSValue * o_value;
NSInvocation * o_inv;
NSConditionLock * o_lock;
-
+
o_data = [[o_msg components] lastObject];
- o_inv = *((NSInvocation **)[o_data bytes]);
+ o_inv = *((NSInvocation **)[o_data bytes]);
[o_inv getArgument: &o_value atIndex: 2];
val = (id **)[o_value pointerValue];
[o_inv setArgument: val[1] atIndex: 2];
projects / vlc / blobdiff