#include <vlc_dialog.h>
#include <vlc_url.h>
#include <vlc_modules.h>
+#include <vlc_aout_intf.h>
+#include <vlc_vout_window.h>
#include <unistd.h> /* execl() */
+#import "CompatibilityFixes.h"
#import "intf.h"
-#import "fspanel.h"
+#import "MainMenu.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 "coredialogs.h"
#import "embeddedwindow.h"
#import "AppleRemote.h"
#import "eyetv.h"
#import "simple_prefs.h"
-#import "AudioEffects.h"
+#import "CoreInteraction.h"
+#import "TrackSynchronization.h"
#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
#import <Sparkle/Sparkle.h> /* we're the update delegate */
*****************************************************************************/
static void Run ( intf_thread_t *p_intf );
-static void * ManageThread( void *user_data );
-
static void updateProgressPanel (void *, const char *, float);
static bool checkProgressPanel (void *);
static void destroyProgressPanel (void *);
-static void MsgCallback( msg_cb_data_t *, msg_item_t *, unsigned );
+static void MsgCallback( void *data, int type, const msg_item_t *item, const char *format, va_list ap );
+
+static int InputEvent( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int PLItemChanged( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int PlaylistUpdated( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int PlaybackModeUpdated( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
+static int VolumeUpdated( vlc_object_t *, const char *,
+ vlc_value_t, vlc_value_t, void * );
#pragma mark -
#pragma mark VLC Interface Object Callbacks
*****************************************************************************/
int OpenIntf ( vlc_object_t *p_this )
{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ [VLCApplication sharedApplication];
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 ) );
/* subscribe to LibVLCCore's messages */
- p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, MsgCallback, NULL );
+ p_intf->p_sys->p_sub = vlc_Subscribe( MsgCallback, NULL );
p_intf->pf_run = Run;
p_intf->b_should_run_on_first_thread = true;
+ [o_pool release];
return VLC_SUCCESS;
}
free( p_intf->p_sys );
}
+static int WindowControl( vout_window_t *, int i_query, va_list );
+
+int WindowOpen( vout_window_t *p_wnd, const vout_window_cfg_t *cfg )
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ intf_thread_t *p_intf = VLCIntf;
+ if (!p_intf) {
+ msg_Err( p_wnd, "Mac OS X interface not found" );
+ return VLC_EGENERIC;
+ }
+
+ int i_x = cfg->x;
+ int i_y = cfg->y;
+ unsigned i_width = cfg->width;
+ unsigned i_height = cfg->height;
+ p_wnd->handle.nsobject = [[VLCMain sharedInstance] getVideoViewAtPositionX: &i_x Y: &i_y withWidth: &i_width andHeight: &i_height];
+
+ if ( !p_wnd->handle.nsobject ) {
+ msg_Err( p_wnd, "got no video view from the interface" );
+ [o_pool release];
+ return VLC_EGENERIC;
+ }
+
+ [[VLCMain sharedInstance] setNativeVideoSize:NSMakeSize( cfg->width, cfg->height )];
+ [[VLCMain sharedInstance] setActiveVideoPlayback: YES];
+ p_wnd->control = WindowControl;
+ p_wnd->sys = (vout_window_sys_t *)VLCIntf;
+ [o_pool release];
+ return VLC_SUCCESS;
+}
+
+static int WindowControl( vout_window_t *p_wnd, int i_query, va_list args )
+{
+ /* TODO */
+ if( i_query == VOUT_WINDOW_SET_STATE )
+ NSLog( @"WindowControl:VOUT_WINDOW_SET_STATE" );
+ else if( i_query == VOUT_WINDOW_SET_SIZE )
+ {
+ NSLog( @"WindowControl:VOUT_WINDOW_SET_SIZE" );
+ unsigned int i_width = va_arg( args, unsigned int );
+ unsigned int i_height = va_arg( args, unsigned int );
+ [[VLCMain sharedInstance] setNativeVideoSize:NSMakeSize( i_width, i_height )];
+ }
+ else if( i_query == VOUT_WINDOW_SET_FULLSCREEN )
+ NSLog( @"WindowControl:VOUT_WINDOW_SET_FULLSCREEN" );
+ else
+ NSLog( @"WindowControl: unknown query" );
+ return VLC_SUCCESS;
+}
+
+void WindowClose( vout_window_t *p_wnd )
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] setActiveVideoPlayback:NO];
+ NSLog( @"Window Close" );
+ // tell the interface to get rid of the video, TODO
+ [o_pool release];
+}
+
/*****************************************************************************
* Run: main loop
*****************************************************************************/
{
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 );
-
/* 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
+ * menu item to make sure daemon 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];
+ [VLCApplication sharedApplication];
o_appLock = [[NSLock alloc] init];
- [VLCApplication sharedApplication];
-
[[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
[NSApp run];
[[VLCMain sharedInstance] applicationWillTerminate:nil];
-
+ [o_appLock release];
[o_pool release];
}
/*****************************************************************************
* MsgCallback: Callback triggered by the core once a new debug message is
* ready to be displayed. We store everything in a NSArray in our Cocoa part
- * of this file, so we are forwarding everything through notifications.
+ * of this file.
*****************************************************************************/
-static void MsgCallback( msg_cb_data_t *data, msg_item_t *item, unsigned int i )
+static void MsgCallback( void *data, int type, const msg_item_t *item, const char *format, va_list ap )
{
int canc = vlc_savecancel();
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ char *str;
- /* this may happen from time to time, let's bail out as info would be useless anyway */
- if( !item->psz_module || !item->psz_msg )
+ if (vasprintf( &str, format, ap ) == -1)
+ {
+ vlc_restorecancel( canc );
return;
+ }
- NSDictionary *o_dict = [NSDictionary dictionaryWithObjectsAndKeys:
- [NSString stringWithUTF8String: item->psz_module], @"Module",
- [NSString stringWithUTF8String: item->psz_msg], @"Message",
- [NSNumber numberWithInt: item->i_type], @"Type", nil];
-
- [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCCoreMessageReceived"
- object: nil
- userInfo: o_dict];
-
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] processReceivedlibvlcMessage: item ofType: type withStr: str];
[o_pool release];
+
vlc_restorecancel( canc );
+ free( str );
}
-/*****************************************************************************
- * 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 )
+static int InputEvent( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t new_val, void *param )
{
- intf_thread_t * p_intf = VLCIntf;
- if( p_intf && p_intf->p_sys )
- {
- 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;
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ switch (new_val.i_int) {
+ case INPUT_EVENT_STATE:
+ [[VLCMain sharedInstance] playbackStatusUpdated];
+ break;
+ case INPUT_EVENT_RATE:
+ [[VLCMainMenu sharedInstance] performSelectorOnMainThread:@selector(updatePlaybackRate) withObject: nil waitUntilDone:NO];
+ break;
+ case INPUT_EVENT_POSITION:
+ [[VLCMain sharedInstance] updatePlaybackPosition];
+ break;
+ case INPUT_EVENT_TITLE:
+ case INPUT_EVENT_CHAPTER:
+ [[VLCMain sharedInstance] updateMainMenu];
+ break;
+ case INPUT_EVENT_CACHE:
+ [[VLCMain sharedInstance] updateMainWindow];
+ break;
+ case INPUT_EVENT_STATISTICS:
+ [[[VLCMain sharedInstance] info] performSelectorOnMainThread:@selector(updateStatistics) withObject: nil waitUntilDone: NO];
+ break;
+ case INPUT_EVENT_ES:
+ break;
+ case INPUT_EVENT_TELETEXT:
+ break;
+ case INPUT_EVENT_AOUT:
+ break;
+ case INPUT_EVENT_VOUT:
+ break;
+ case INPUT_EVENT_ITEM_META:
+ case INPUT_EVENT_ITEM_INFO:
+ [[VLCMain sharedInstance] updateMainMenu];
+ [[VLCMain sharedInstance] updateName];
+ [[VLCMain sharedInstance] updateInfoandMetaPanel];
+ break;
+ case INPUT_EVENT_BOOKMARK:
+ break;
+ case INPUT_EVENT_RECORD:
+ [[VLCMain sharedInstance] updateRecordState: var_GetBool( p_this, "record" )];
+ break;
+ case INPUT_EVENT_PROGRAM:
+ [[VLCMain sharedInstance] updateMainMenu];
+ break;
+ case INPUT_EVENT_ITEM_EPG:
+ break;
+ case INPUT_EVENT_SIGNAL:
+ break;
+
+ case INPUT_EVENT_ITEM_NAME:
+ [[VLCMain sharedInstance] updateName];
+ [[VLCMain sharedInstance] playlistUpdated];
+ break;
+
+ case INPUT_EVENT_AUDIO_DELAY:
+ case INPUT_EVENT_SUBTITLE_DELAY:
+ [[VLCMain sharedInstance] updateDelays];
+ break;
+
+ case INPUT_EVENT_DEAD:
+ [[VLCMain sharedInstance] updateName];
+ [[VLCMain sharedInstance] updatePlaybackPosition];
+ break;
+
+ case INPUT_EVENT_ABORT:
+ [[VLCMain sharedInstance] updateName];
+ [[VLCMain sharedInstance] updatePlaybackPosition];
+ break;
+
+ default:
+ //msg_Warn( p_this, "unhandled input event (%lld)", new_val.i_int );
+ break;
}
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
+
+static int PLItemChanged( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(PlaylistItemChanged) withObject:nil waitUntilDone:NO];
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
+
+static int PlaylistUpdated( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(playlistUpdated) withObject:nil waitUntilDone:NO];
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
+
+static int PlaybackModeUpdated( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] playbackModeUpdated];
+
+ [o_pool release];
+ return VLC_SUCCESS;
+}
+
+static int VolumeUpdated( vlc_object_t *p_this, const char *psz_var,
+ vlc_value_t oldval, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] performSelectorOnMainThread:@selector(updateVolume) withObject:nil waitUntilDone:NO];
+
+ [o_pool release];
return VLC_SUCCESS;
}
{
intf_thread_t * p_intf = VLCIntf;
if( p_intf && p_intf->p_sys )
- p_intf->p_sys->b_intf_show = true;
+ {
+// [[[VLCMain sharedInstance] fspanel] makeKeyAndOrderFront: nil];
+ }
return VLC_SUCCESS;
}
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- if( p_intf && p_intf->p_sys )
- p_intf->p_sys->b_fullscreen_update = true;
+ if (p_intf)
+ {
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ [[VLCMain sharedInstance] fullscreenChanged];
+ [o_pool release];
+ }
return VLC_SUCCESS;
}
}
NSValue *o_value = [NSValue valueWithPointer:value.p_address];
- [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewCoreDialogEventNotification" object:[interface coreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_value, @"VLCDialogPointer", [NSString stringWithUTF8String: type], @"VLCDialogType", nil]];
+ [[VLCCoreDialogProvider sharedInstance] performEventWithObject: o_value ofType: type];
[o_pool release];
return VLC_SUCCESS;
return p_vout;
}
-aout_instance_t *getAout(void)
+audio_output_t *getAout(void)
{
input_thread_t *p_input = getInput();
if (!p_input)
return NULL;
- aout_instance_t *p_aout = input_GetAout(p_input);
+ audio_output_t *p_aout = input_GetAout(p_input);
vlc_object_release(p_input);
return p_aout;
}
o_msg_lock = [[NSLock alloc] init];
o_msg_arr = [[NSMutableArray arrayWithCapacity: 600] retain];
- /* subscribe to LibVLC's debug messages as early as possible (for us) */
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(libvlcMessageReceived:) name: @"VLCCoreMessageReceived" object: nil];
- 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_coredialogs = [[VLCCoreDialogProvider alloc] init];
o_info = [[VLCInfo alloc] init];
-
- i_lastShownVolume = -1;
-
+ o_mainmenu = [[VLCMainMenu alloc] init];
+ o_coreinteraction = [[VLCCoreInteraction alloc] init];
o_eyetv = [[VLCEyeTVController alloc] init];
+ o_mainwindow = [[VLCMainWindow alloc] init];
/* announce our launch to a potential eyetv plugin */
[[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
- (void)awakeFromNib
{
- NSString* o_key;
playlist_t *p_playlist;
vlc_value_t val;
-
if( !p_intf ) return;
+ var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
/* Check if we already did this once. Opening the other nibs calls it too,
- because VLCMain is the owner */
+ 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];
- /* In code and not in Nib for 10.4 compat */
- NSToolbar * toolbar = [[[NSToolbar alloc] initWithIdentifier:@"mainControllerToolbar"] autorelease];
- [toolbar setDelegate:self];
- [toolbar setShowsBaselineSeparator:NO];
- [toolbar setAllowsUserCustomization:NO];
- [toolbar setDisplayMode:NSToolbarDisplayModeIconOnly];
- [toolbar setAutosavesConfiguration:YES];
- [o_window setToolbar:toolbar];
-
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-quit" )];
- [o_mi_quit setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_quit setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-play-pause" )];
- [o_mi_play setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_play setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-stop" )];
- [o_mi_stop setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_stop setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-faster" )];
- [o_mi_faster setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_faster setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-slower" )];
- [o_mi_slower setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_slower setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-rate-normal" )];
- [o_mi_normalSpeed setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_normalSpeed setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-prev" )];
- [o_mi_previous setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_previous setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-next" )];
- [o_mi_next setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_next setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump+short" )];
- [o_mi_fwd setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_fwd setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump-short" )];
- [o_mi_bwd setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_bwd setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump+medium" )];
- [o_mi_fwd1m setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_fwd1m setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump-medium" )];
- [o_mi_bwd1m setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_bwd1m setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump+long" )];
- [o_mi_fwd5m setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_fwd5m setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-jump-long" )];
- [o_mi_bwd5m setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_bwd5m setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-vol-up" )];
- [o_mi_vol_up setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_vol_up setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-vol-down" )];
- [o_mi_vol_down setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_vol_down setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-vol-mute" )];
- [o_mi_mute setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_mute setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-toggle-fullscreen" )];
- [o_mi_fullscreen setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_fullscreen setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-snapshot" )];
- [o_mi_snapshot setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_snapshot setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-random" )];
- [o_mi_random setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_random setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-zoom-half" )];
- [o_mi_half_window setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_half_window setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-zoom-original" )];
- [o_mi_normal_window setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_normal_window setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_key]];
- o_key = [NSString stringWithFormat:@"%s", config_GetPsz( p_intf, "key-zoom-double" )];
- [o_mi_double_window setKeyEquivalent: [self VLCKeyToString: o_key]];
- [o_mi_double_window setKeyEquivalentModifierMask: [self VLCModifiersToCocoa:o_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;
-
- // 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. )
- {
- 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
- {
- 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];
- }
-
- [self updateTogglePlaylistState];
-
- o_size_with_playlist = [o_window contentRectForFrameRect:[o_window frame]].size;
-
p_playlist = pl_Get( p_intf );
val.b_bool = false;
var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self);
+// var_AddCallback(p_playlist, "item-change", PLItemChanged, self);
+ var_AddCallback(p_playlist, "item-current", PLItemChanged, self);
+ var_AddCallback(p_playlist, "activity", PLItemChanged, self);
+ var_AddCallback(p_playlist, "leaf-to-parent", PlaylistUpdated, self);
+ var_AddCallback(p_playlist, "playlist-item-append", PlaylistUpdated, self);
+ var_AddCallback(p_playlist, "playlist-item-deleted", PlaylistUpdated, self);
+ var_AddCallback(p_playlist, "random", PlaybackModeUpdated, self);
+ var_AddCallback(p_playlist, "repeat", PlaybackModeUpdated, self);
+ var_AddCallback(p_playlist, "loop", PlaybackModeUpdated, self);
+ var_AddCallback(p_playlist, "volume", VolumeUpdated, self);
+ var_AddCallback(p_playlist, "mute", VolumeUpdated, self);
+
+ if ([NSApp currentSystemPresentationOptions] == NSApplicationPresentationFullScreen)
+ var_SetBool( p_playlist, "fullscreen", YES );
/* load our Core Dialogs nib */
nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
var_AddCallback( p_intf, "dialog-progress-bar", DialogCallback, self );
dialog_Register( p_intf );
- /* update the playmode stuff */
- p_intf->p_sys->b_playmode_update = true;
-
- [[NSNotificationCenter defaultCenter] addObserver: self
- selector: @selector(refreshVoutDeviceMenu:)
- name: NSApplicationDidChangeScreenParametersNotification
- object: nil];
-
- /* take care of tint changes during runtime */
- o_img_play = [NSImage imageNamed: @"play"];
- o_img_pause = [NSImage imageNamed: @"pause"];
+ [self playbackModeUpdated];
/* init Apple Remote support */
o_remote = [[AppleRemote alloc] init];
[o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
[o_remote setDelegate: _o_sharedMainInstance];
- /* init media key support */
- o_mediaKeyController = [[SPMediaKeyTap alloc] initWithDelegate:self];
- b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
- [o_mediaKeyController startWatchingMediaKeys];
- [o_mediaKeyController setShouldInterceptMediaKeyEvents:b_mediaKeySupport];
- [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(coreChangedMediaKeySupportSetting:) name: @"VLCMediaKeySupportSettingChanged" object: nil];
- [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
- [SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers], kMediaKeyUsingBundleIdentifiersDefaultsKey,
- nil]];
-
/* yeah, we are done */
+ b_nativeFullscreenMode = config_GetInt( p_intf, "macosx-nativefullscreenmode" );
nib_main_loaded = TRUE;
}
-- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
-{
- if( !p_intf ) return;
-
- /* FIXME: don't poll */
- interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
- target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE] retain];
-
- /* Note: we use the pthread API to support pre-10.5 */
- pthread_create( &manage_thread, NULL, ManageThread, self );
-
- [o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
- var: "intf-add" selector: @selector(toggleVar:)];
-
- vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-}
-
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
if( !p_intf ) return;
+ /* init media key support */
+ b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
+ if( b_mediaKeySupport )
+ {
+ o_mediaKeyController = [[SPMediaKeyTap alloc] initWithDelegate:self];
+ [o_mediaKeyController startWatchingMediaKeys];
+ [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
+ [SPMediaKeyTap defaultMediaKeyUserBundleIdentifiers], kMediaKeyUsingBundleIdentifiersDefaultsKey,
+ nil]];
+ }
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(coreChangedMediaKeySupportSetting:) name: @"VLCMediaKeySupportSettingChanged" object: nil];
+
[self _removeOldPreferences];
+ [o_mainwindow updateWindow];
+ [o_mainwindow updateTimeSlider];
+ [o_mainwindow updateVolumeSlider];
+ [o_mainwindow makeKeyAndOrderFront: self];
+
/* Handle sleep notification */
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
name:NSWorkspaceWillSleepNotification object:nil];
{
if( !p_intf ) return;
- [o_window setTitle: _NS("VLC media player")];
- [self setScrollField:_NS("VLC media player") stopAfter:-1];
-
- /* button controls */
- [o_btn_prev setToolTip: _NS("Previous")];
- [o_btn_rewind setToolTip: _NS("Rewind")];
- [o_btn_play setToolTip: _NS("Play")];
- [o_btn_stop setToolTip: _NS("Stop")];
- [o_btn_ff setToolTip: _NS("Fast Forward")];
- [o_btn_next setToolTip: _NS("Next")];
- [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 setTitle: _NS("Messages")];
[o_msgs_crashlog_btn setTitle: _NS("Open CrashLog...")];
[o_msgs_save_btn setTitle: _NS("Save this Log...")];
- /* main menu */
- [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("Advanced Open File...")];
- [o_mi_open_file setTitle: _NS("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_copy setTitle: _NS("Copy")];
- [o_mi_paste setTitle: _NS("Paste")];
- [o_mi_clear setTitle: _NS("Clear")];
- [o_mi_select_all setTitle: _NS("Select All")];
-
- [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_normalSpeed setTitle: _NS("Normal rate")];
- [o_mi_previous setTitle: _NS("Previous")];
- [o_mi_next setTitle: _NS("Next")];
- [o_mi_random setTitle: _NS("Random")];
- [o_mi_repeat setTitle: _NS("Repeat One")];
- [o_mi_loop setTitle: _NS("Repeat All")];
- [o_mi_quitAfterPB setTitle: _NS("Quit after Playback")];
- [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_mu_chapter setTitle: _NS("Chapter")];
-
- [o_mu_audio setTitle: _NS("Audio")];
- [o_mi_vol_up setTitle: _NS("Increase Volume")];
- [o_mi_vol_down setTitle: _NS("Decrease Volume")];
- [o_mi_mute setTitle: _NS("Mute")];
- [o_mi_audiotrack setTitle: _NS("Audio Track")];
- [o_mu_audiotrack setTitle: _NS("Audio Track")];
- [o_mi_channels setTitle: _NS("Audio Channels")];
- [o_mu_channels setTitle: _NS("Audio Channels")];
- [o_mi_device setTitle: _NS("Audio Device")];
- [o_mu_device setTitle: _NS("Audio Device")];
- [o_mi_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_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_addSub setTitle: _NS("Open File...")];
- [o_mi_deinterlace setTitle: _NS("Deinterlace")];
- [o_mu_deinterlace setTitle: _NS("Deinterlace")];
- [o_mi_deinterlace_mode setTitle: _NS("Deinterlace mode")];
- [o_mu_deinterlace_mode setTitle: _NS("Deinterlace mode")];
- [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
- [o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
- [o_mi_teletext setTitle: _NS("Teletext")];
- [o_mi_teletext_transparent setTitle: _NS("Transparent")];
- [o_mi_teletext_index setTitle: _NS("Index")];
- [o_mi_teletext_red setTitle: _NS("Red")];
- [o_mi_teletext_green setTitle: _NS("Green")];
- [o_mi_teletext_yellow setTitle: _NS("Yellow")];
- [o_mi_teletext_blue setTitle: _NS("Blue")];
-
- [o_mu_window setTitle: _NS("Window")];
- [o_mi_minimize setTitle: _NS("Minimize Window")];
- [o_mi_close_window setTitle: _NS("Close Window")];
- [o_mi_player setTitle: _NS("Player...")];
- [o_mi_controller setTitle: _NS("Controller...")];
- [o_mi_audioeffects setTitle: _NS("Audio Effects...")];
- [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_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")];
- [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")];
-
/* crash reporter panel */
[o_crashrep_send_btn setTitle: _NS("Send")];
[o_crashrep_dontSend_btn setTitle: _NS("Don't Send")];
#pragma mark -
#pragma mark Termination
-- (void)releaseRepresentedObjects:(NSMenu *)the_menu
-{
- if( !p_intf ) return;
-
- NSArray *menuitems_array = [the_menu itemArray];
- for( int i=0; i<[menuitems_array count]; i++ )
- {
- NSMenuItem *one_item = [menuitems_array objectAtIndex: i];
- if( [one_item hasSubmenu] )
- [self releaseRepresentedObjects: [one_item submenu]];
-
- [one_item setRepresentedObject:NULL];
- }
-}
-
- (void)applicationWillTerminate:(NSNotification *)notification
{
playlist_t * p_playlist;
msg_Dbg( p_intf, "Terminating" );
- pthread_join( manage_thread, NULL );
-
/* Make sure the intf object is getting killed */
vlc_object_kill( p_intf );
-
- /* Make sure the interfaceTimer is destroyed */
- [interfaceTimer invalidate];
- [interfaceTimer release];
- interfaceTimer = nil;
-
- /* make sure that the current volume is saved */
- config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );
-
- /* save the prefs if they were changed in the extended panel */
- if(o_extended && [o_extended configChanged])
- [o_extended savePrefs];
+ p_playlist = pl_Get( p_intf );
/* unsubscribe from the interactive dialogues */
dialog_Unregister( p_intf );
var_DelCallback( p_intf, "dialog-login", DialogCallback, self );
var_DelCallback( p_intf, "dialog-question", DialogCallback, self );
var_DelCallback( p_intf, "dialog-progress-bar", DialogCallback, self );
+ //var_DelCallback(p_playlist, "item-change", PLItemChanged, self);
+ var_DelCallback(p_playlist, "item-current", PLItemChanged, self);
+ var_DelCallback(p_playlist, "activity", PLItemChanged, self);
+ var_DelCallback(p_playlist, "leaf-to-parent", PlaylistUpdated, self);
+ var_DelCallback(p_playlist, "playlist-item-append", PlaylistUpdated, self);
+ var_DelCallback(p_playlist, "playlist-item-deleted", PlaylistUpdated, self);
+ var_DelCallback(p_playlist, "random", PlaybackModeUpdated, self);
+ var_DelCallback(p_playlist, "repeat", PlaybackModeUpdated, self);
+ var_DelCallback(p_playlist, "loop", PlaybackModeUpdated, self);
+ var_DelCallback(p_playlist, "volume", VolumeUpdated, self);
+ var_DelCallback(p_playlist, "mute", VolumeUpdated, self);
/* remove global observer watching for vout device changes correctly */
[[NSNotificationCenter defaultCenter] removeObserver: self];
/* release some other objects here, because it isn't sure whether dealloc
* will be called later on */
- if( nib_about_loaded )
- [o_about release];
-
- if( nib_prefs_loaded )
- {
+ if( o_sprefs )
[o_sprefs release];
- [o_prefs release];
- }
-
- if( nib_open_loaded )
- [o_open release];
-
- if( nib_extended_loaded )
- [o_extended release];
- if (nib_audioeffects_loaded)
- [o_audioeffects release];
+ if( o_prefs )
+ [o_prefs release];
- if( nib_bookmarks_loaded )
- [o_bookmarks release];
+ [o_open release];
if( o_info )
- {
- [o_info stopTimers];
[o_info release];
- }
- if( nib_wizard_loaded )
+ if( o_wizard )
[o_wizard release];
[crashLogURLConnection cancel];
[o_embedded_list release];
[o_coredialogs release];
[o_eyetv release];
-
- [o_img_pause_pressed release];
- [o_img_play_pressed release];
- [o_img_pause release];
- [o_img_play release];
+ [o_mainwindow release];
/* unsubscribe from libvlc's debug messages */
- msg_Unsubscribe( p_intf->p_sys->p_sub );
+ vlc_Unsubscribe( p_intf->p_sys->p_sub );
[o_msg_arr removeAllObjects];
[o_msg_arr release];
[[NSUserDefaults standardUserDefaults] synchronize];
/* Make sure the Menu doesn't have any references to vlc objects anymore */
- [self releaseRepresentedObjects:[NSApp mainMenu]];
+ //FIXME: this should be moved to VLCMainMenu
+ [o_mainmenu releaseRepresentedObjects:[NSApp mainMenu]];
+ [o_mainmenu release];
/* 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_Get( p_intf );
vlc_object_kill( p_playlist );
libvlc_Quit( p_intf->p_libvlc );
/* received directly before the update gets installed, so let's shut down a bit */
- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
{
+ [NSApp activateIgnoringOtherApps:YES];
[o_remote stopListening: self];
var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_STOP );
-
- /* Close the window directly, because we do know that there
- * won't be anymore video. It's currently waiting a bit. */
- [[[o_controls voutView] window] orderOut:self];
-}
-
-#pragma mark -
-#pragma mark Toolbar delegate
-
-/* Our item identifiers */
-static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl";
-
-- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
-{
- return [NSArray arrayWithObjects:
-// NSToolbarCustomizeToolbarItemIdentifier,
-// NSToolbarFlexibleSpaceItemIdentifier,
-// NSToolbarSpaceItemIdentifier,
-// NSToolbarSeparatorItemIdentifier,
- VLCToolbarMediaControl,
- nil ];
-}
-
-- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
-{
- return [NSArray arrayWithObjects:
- VLCToolbarMediaControl,
- nil ];
-}
-
-- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
-{
- NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
- 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
- {
- /* 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;
}
#pragma mark -
/* Triggered when the computer goes to sleep */
- (void)computerWillSleep: (NSNotification *)notification
{
- /* Pause */
- if( p_intf && p_intf->p_sys->i_play_status == PLAYING_S )
+ input_thread_t * p_input;
+
+ p_input = pl_CurrentInput( p_intf );
+ if( p_input )
{
- var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+ int state = var_GetInteger( p_input, "state" );
+ if( state == PLAYING_S )
+ var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+ vlc_object_release( p_input );
}
}
- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows
{
if(!hasVisibleWindows)
- [o_window makeKeyAndOrderFront:self];
+ [o_mainwindow makeKeyAndOrderFront:self];
return YES;
}
switch([buttonIdentifierNumber intValue])
{
case kRemoteButtonRight_Hold:
- [o_controls forward: self];
+ [[VLCCoreInteraction sharedInstance] forward];
break;
case kRemoteButtonLeft_Hold:
- [o_controls backward: self];
+ [[VLCCoreInteraction sharedInstance] backward];
break;
case kRemoteButtonVolume_Plus_Hold:
- [o_controls volumeUp: self];
+ [[VLCCoreInteraction sharedInstance] volumeUp];
break;
case kRemoteButtonVolume_Minus_Hold:
- [o_controls volumeDown: self];
+ [[VLCCoreInteraction sharedInstance] volumeDown];
break;
}
if(b_remote_button_hold)
switch( buttonIdentifier )
{
case k2009RemoteButtonFullscreen:
- [o_controls toogleFullscreen:self];
+ [[VLCCoreInteraction sharedInstance] toggleFullscreen];
break;
case k2009RemoteButtonPlay:
- [o_controls play:self];
+ [[VLCCoreInteraction sharedInstance] play];
break;
case kRemoteButtonPlay:
if(count >= 2) {
- [o_controls toogleFullscreen:self];
+ [[VLCCoreInteraction sharedInstance] toggleFullscreen];
} else {
- [o_controls play: self];
+ [[VLCCoreInteraction sharedInstance] play];
}
break;
case kRemoteButtonVolume_Plus:
- [o_controls volumeUp: self];
+ [[VLCCoreInteraction sharedInstance] volumeUp];
break;
case kRemoteButtonVolume_Minus:
- [o_controls volumeDown: self];
+ [[VLCCoreInteraction sharedInstance] volumeDown];
break;
case kRemoteButtonRight:
- [o_controls next: self];
+ [[VLCCoreInteraction sharedInstance] next];
break;
case kRemoteButtonLeft:
- [o_controls prev: self];
+ [[VLCCoreInteraction sharedInstance] previous];
break;
case kRemoteButtonRight_Hold:
case kRemoteButtonLeft_Hold:
}
break;
case kRemoteButtonMenu:
- [o_controls showPosition: self];
+ [o_controls showPosition: self]; //FIXME
break;
default:
/* Add here whatever you want other buttons to do */
if( psz != NULL )
{
- o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
+ o_str = [NSString stringWithCString: psz encoding:NSUTF8StringEncoding];
if( o_str == NULL )
{
int i;
NSMutableString *tempString = [[[NSMutableString alloc] init] autorelease];
NSMutableString *tempStringPlus = [[[NSMutableString alloc] init] autorelease];
-
+
val.i_int = 0;
p_hotkeys = p_intf->p_libvlc->p_hotkeys;
[tempString appendString:@"Command-"];
[tempStringPlus appendString:@"Command+"];
}
-
+
[tempString appendString:[[o_event charactersIgnoringModifiers] lowercaseString]];
[tempStringPlus appendString:[[o_event charactersIgnoringModifiers] lowercaseString]];
-
+
key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
switch( key )
assert( p_main );
unsigned confsize;
module_config_t *p_config;
-
+
p_config = module_config_get (p_main, &confsize);
-
+
for (size_t i = 0; i < confsize; i++)
{
module_config_t *p_item = p_config + i;
-
- if( (p_item->i_type & CONFIG_ITEM) && p_item->psz_name != NULL
+
+ if( CONFIG_ITEM(p_item->i_type) && p_item->psz_name != NULL
&& !strncmp( p_item->psz_name , "key-", 4 )
&& !EMPTY_STR( p_item->psz_text ) )
{
}
}
module_config_free (p_config);
- module_release (p_main);
- o_usedHotkeys = [[NSArray alloc] initWithArray: o_usedHotkeys copyItems: YES];
+ o_usedHotkeys = [[NSArray alloc] initWithArray: o_usedHotkeys copyItems: YES];
}
-
#pragma mark -
-#pragma mark Other objects getters
-
-- (id)controls
+#pragma mark Interface updaters
+- (void)fullscreenChanged
{
- if( o_controls )
- return o_controls;
+ playlist_t * p_playlist = pl_Get( VLCIntf );
+ BOOL b_fullscreen = var_GetBool( p_playlist, "fullscreen" );
- return nil;
+ if (OSX_LION && b_nativeFullscreenMode)
+ {
+ [o_mainwindow toggleFullScreen: self];
+ if(b_fullscreen)
+ [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen)];
+ else
+ [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
+ }
+ else
+ {
+ input_thread_t * p_input = pl_CurrentInput( VLCIntf );
+
+ if( p_input != NULL )
+ {
+ if(b_fullscreen)
+ [o_mainwindow performSelectorOnMainThread:@selector(enterFullscreen) withObject:nil waitUntilDone:NO];
+ else
+ [o_mainwindow performSelectorOnMainThread:@selector(leaveFullscreen) withObject:nil waitUntilDone:NO];
+ vlc_object_release( p_input );
+ }
+ }
}
-- (id)simplePreferences
+- (void)PlaylistItemChanged
{
- if( !o_sprefs )
- return nil;
+ input_thread_t * p_input;
- if( !nib_prefs_loaded )
- nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
+ p_input = playlist_CurrentInput( pl_Get(VLCIntf) );
+ if( p_input && !( p_input->b_dead || !vlc_object_alive(p_input) ) )
+ {
+ var_AddCallback( p_input, "intf-event", InputEvent, [VLCMain sharedInstance] );
+ [o_mainmenu setRateControlsEnabled: YES];
+ vlc_object_release( p_input );
+ }
+ else
+ [o_mainmenu setRateControlsEnabled: NO];
- return o_sprefs;
+ [o_playlist updateRowSelection];
+ [o_mainwindow updateWindow];
+ [self updateMainMenu];
}
-- (id)preferences
+- (void)updateMainMenu
{
- if( !o_prefs )
- return nil;
-
- if( !nib_prefs_loaded )
- nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
-
- return o_prefs;
+ [o_mainmenu setupMenus];
+ [o_mainmenu updatePlaybackRate];
}
-- (id)playlist
+- (void)updateMainWindow
{
- if( o_playlist )
- return o_playlist;
-
- return nil;
+ [o_mainwindow updateWindow];
}
-- (BOOL)isPlaylistCollapsed
+- (void)showFullscreenController
{
- return ![o_btn_playlist state];
+ [o_mainwindow showFullscreenController];
}
-- (id)info
+- (void)updateDelays
{
- if( o_info )
- return o_info;
+ [[VLCTrackSynchronization sharedInstance] performSelectorOnMainThread: @selector(updateValues) withObject: nil waitUntilDone:NO];
+}
- return nil;
+- (void)updateName
+{
+ [o_mainwindow updateName];
}
-- (id)wizard
+- (void)updatePlaybackPosition
{
- if( o_wizard )
- return o_wizard;
-
- return nil;
-}
-
-- (id)bookmarks
-{
- if( o_bookmarks )
- return o_bookmarks;
-
- return nil;
-}
-
-- (id)embeddedList
-{
- if( o_embedded_list )
- return o_embedded_list;
-
- return nil;
-}
-
-- (id)coreDialogProvider
-{
- if( o_coredialogs )
- return o_coredialogs;
-
- return nil;
-}
-
-- (id)mainIntfPgbar
-{
- if( o_main_pgbar )
- return o_main_pgbar;
+ [o_mainwindow updateTimeSlider];
- return nil;
-}
-
-- (id)controllerWindow
-{
- if( o_window )
- return o_window;
- return nil;
+ input_thread_t * p_input;
+ p_input = pl_CurrentInput( p_intf );
+ if( p_input )
+ {
+ if( var_GetInteger( p_input, "state" ) == PLAYING_S )
+ UpdateSystemActivity( UsrActivity );
+ vlc_object_release( p_input );
+ }
}
-- (id)voutMenu
+- (void)updateVolume
{
- return o_vout_menu;
+ [o_mainwindow updateVolumeSlider];
}
-- (id)eyeTVController
+- (void)playlistUpdated
{
- if( o_eyetv )
- return o_eyetv;
-
- return nil;
+ [self playbackStatusUpdated];
+ [o_playlist playlistUpdated];
+ [o_mainwindow updateWindow];
+ [o_mainwindow updateName];
}
-- (id)appleRemoteController
+- (void)updateRecordState: (BOOL)b_value
{
- return o_remote;
+ [o_mainmenu updateRecordState:b_value];
}
-#pragma mark -
-#pragma mark Polling
-
-/*****************************************************************************
- * ManageThread: An ugly thread that polls
- *****************************************************************************/
-static void * ManageThread( void *user_data )
+- (void)updateInfoandMetaPanel
{
- id self = user_data;
-
- [self manage];
-
- return NULL;
+ [o_playlist outlineViewSelectionDidChange:nil];
}
-struct manage_cleanup_stack {
- intf_thread_t * p_intf;
- input_thread_t ** p_input;
- playlist_t * p_playlist;
- id self;
-};
-
-static void manage_cleanup( void * args )
+- (void)playbackStatusUpdated
{
- struct manage_cleanup_stack * manage_cleanup_stack = args;
- intf_thread_t * p_intf = manage_cleanup_stack->p_intf;
- input_thread_t * p_input = *manage_cleanup_stack->p_input;
- id self = manage_cleanup_stack->self;
- playlist_t * p_playlist = manage_cleanup_stack->p_playlist;
-
- var_DelCallback( p_playlist, "item-current", PlaylistChanged, self );
- var_DelCallback( p_playlist, "intf-change", PlaylistChanged, self );
- var_DelCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_DelCallback( p_playlist, "playlist-item-append", PlaylistChanged, self );
- var_DelCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self );
-
- if( p_input ) vlc_object_release( p_input );
-}
-
-- (void)manage
-{
- playlist_t * p_playlist;
- input_thread_t * p_input = NULL;
-
- /* new thread requires a new pool */
-
- vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
-
- p_playlist = pl_Get( p_intf );
-
- var_AddCallback( p_playlist, "item-current", PlaylistChanged, self );
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-item-append", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-item-deleted", PlaylistChanged, self );
-
- struct manage_cleanup_stack stack = { p_intf, &p_input, p_playlist, self };
- pthread_cleanup_push(manage_cleanup, &stack);
-
- bool exitLoop = false;
- while( !exitLoop )
- {
- NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-
- if( !p_input )
- {
- p_input = playlist_CurrentInput( p_playlist );
-
- /* Refresh the interface */
- if( p_input )
- {
- 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;
- }
- else if( cachedInputState != input_GetState( p_input ) )
- {
- p_intf->p_sys->b_intf_update = true;
- }
-
- /* Manage volume status */
- [self manageVolumeSlider];
-
- msleep( INTF_IDLE_SLEEP );
-
- [pool release];
-
- [o_appLock lock];
- exitLoop = (f_appExit != 0 ? true : false);
- [o_appLock unlock];
- }
-
- pthread_cleanup_pop(1);
-}
-
-- (void)manageVolumeSlider
-{
- audio_volume_t i_volume;
- playlist_t * p_playlist = pl_Get( p_intf );
-
- i_volume = aout_VolumeGet( p_playlist );
-
- if( i_volume != i_lastShownVolume )
- {
- i_lastShownVolume = i_volume;
- p_intf->p_sys->b_volume_update = TRUE;
- }
-}
-
-- (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 )
- {
- /* 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 */
-
- /* update our info-panel to reflect the new item, if we don't show
- * the playlist or the selection is empty */
- if( [self isPlaylistCollapsed] == YES )
- {
- playlist_t * p_playlist = pl_Get( p_intf );
- PL_LOCK;
- playlist_item_t * p_item = playlist_CurrentPlayingItem( p_playlist );
- PL_UNLOCK;
- if( p_item )
- [[self info] updatePanelWithItem: p_item->p_input];
- }
- }
- if( p_intf->p_sys->b_intf_update )
- {
- 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_Get( p_intf );
-
- PL_LOCK;
- b_plmul = playlist_CurrentSize( p_playlist ) > 1;
- PL_UNLOCK;
-
- p_input = playlist_CurrentInput( p_playlist );
-
- bool b_buffering = NO;
-
- if( ( b_input = ( p_input != NULL ) ) )
- {
- /* seekable streams */
- cachedInputState = input_GetState( p_input );
- if ( cachedInputState == INIT_S ||
- cachedInputState == OPENING_S )
- {
- b_buffering = YES;
- }
-
- /* seekable streams */
- b_seekable = var_GetBool( p_input, "can-seek" );
-
- /* check whether slow/fast motion is possible */
- b_control = var_GetBool( p_input, "can-rate" );
-
- /* chapters & titles */
- //b_chapters = p_input->stream.i_area_nb > 1;
- vlc_object_release( p_input );
- }
-
- if( b_buffering )
- {
- [o_main_pgbar startAnimation:self];
- [o_main_pgbar setIndeterminate:YES];
- [o_main_pgbar setHidden:NO];
- }
- else
- {
- [o_main_pgbar stopAnimation:self];
- [o_main_pgbar setHidden:YES];
- }
-
- [o_btn_stop setEnabled: b_input];
- [o_embedded_window setStop: b_input];
- [o_btn_ff setEnabled: b_seekable];
- [o_btn_rewind setEnabled: b_seekable];
- [o_btn_prev setEnabled: (b_plmul || b_chapters)];
- [o_embedded_window setPrev: (b_plmul || b_chapters)];
- [o_btn_next setEnabled: (b_plmul || b_chapters)];
- [o_embedded_window setNext: (b_plmul || b_chapters)];
-
- [o_timeslider setFloatValue: 0.0];
- [o_timeslider setEnabled: b_seekable];
- [o_timefield setStringValue: @"00:00"];
- [[[self controls] fspanel] setStreamPos: 0 andTime: @"00:00"];
- [[[self controls] fspanel] setSeekable: b_seekable];
-
- [o_embedded_window setSeekable: b_seekable];
- [o_embedded_window setTime:@"00:00" position:0.0];
-
- p_intf->p_sys->b_current_title_update = true;
-
- p_intf->p_sys->b_intf_update = 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;
- }
-
- if( p_intf->p_sys->b_fullscreen_update )
- {
- p_intf->p_sys->b_fullscreen_update = false;
- }
-
- if( p_intf->p_sys->b_intf_show )
- {
- if( [[o_controls voutView] isFullscreen] && config_GetInt( VLCIntf, "macosx-fspanel" ) )
- [[o_controls fspanel] fadeIn];
- else
- [o_window makeKeyAndOrderFront: self];
-
- p_intf->p_sys->b_intf_show = false;
- }
-
p_input = pl_CurrentInput( p_intf );
- if( p_input && vlc_object_alive (p_input) )
- {
- vlc_value_t val;
-
- if( p_intf->p_sys->b_current_title_update )
- {
- NSString *aString;
- input_item_t * p_item = input_GetItem( p_input );
- char * name = input_item_GetNowPlaying( p_item );
-
- if( !name )
- name = input_item_GetName( p_item );
-
- aString = [NSString stringWithUTF8String:name];
-
- free(name);
-
- [self setScrollField: aString stopAfter:-1];
- [[[self controls] fspanel] setStreamTitle: aString];
-
- [[o_controls voutView] updateTitle];
-
- [o_playlist updateRowSelection];
-
- p_intf->p_sys->b_current_title_update = FALSE;
- }
-
- if( [o_timeslider isEnabled] )
- {
- /* Update the slider */
- vlc_value_t time;
- NSString * o_time;
- 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];
-
- var_Get( p_input, "time", &time );
-
- mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) );
- if( b_time_remaining && dur != -1 )
- {
- o_time = [NSString stringWithFormat: @"-%s", secstotimestr( psz_time, ((dur - time.i_time) / 1000000))];
- }
- else
- o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
-
- [o_timefield setStringValue: o_time];
- [[[self controls] fspanel] setStreamPos: f_updated andTime: o_time];
- [o_embedded_window setTime: o_time position: f_updated];
- }
-
- /* 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];
- [o_embedded_window setVolumeSlider: (float)i_lastShownVolume / i_volume_step];
- [o_embedded_window setVolumeEnabled: TRUE];
- [[[self controls] fspanel] 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 updateMessageDisplay];
-
- if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
- [self resetScrollField];
-
- [interfaceTimer autorelease];
-
- interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.3
- target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE] retain];
-}
-
-#pragma mark -
-#pragma mark Interface update
-
-- (void)setupMenus
-{
- playlist_t * p_playlist = pl_Get( p_intf );
- input_thread_t * p_input = playlist_CurrentInput( p_playlist );
- if( p_input != NULL )
+ if( p_input )
{
- [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:)];
-
- /* special case for "Open File" inside the subtitles menu item */
- if( [o_mi_videotrack isEnabled] == YES )
- [o_mi_subtitle setEnabled: YES];
-
- aout_instance_t * p_aout = input_GetAout( p_input );
- if( p_aout != NULL )
+ int state = var_GetInteger( p_input, "state" );
+ if( state == PLAYING_S )
{
- [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 );
+ [[self mainMenu] setPause];
+ [o_mainwindow setPause];
}
-
- vout_thread_t * p_vout = input_GetVout( p_input );
-
- if( p_vout != NULL )
+ else
{
- 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:)];
-
- [o_controls setupVarMenuItem: o_mi_deinterlace_mode target: (vlc_object_t *)p_vout
- var: "deinterlace-mode" selector: @selector(toggleVar:)];
-
-#if 1
- [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
- (vlc_object_t *)p_vout var:"postprocess" selector:
- @selector(toggleVar:)];
-
-#endif
- vlc_object_release( (vlc_object_t *)p_vout );
+ if (state == END_S)
+ [o_mainmenu setSubmenusEnabled: FALSE];
+ [[self mainMenu] setPlay];
+ [o_mainwindow setPlay];
}
vlc_object_release( p_input );
}
}
-- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
+- (void)playbackModeUpdated
{
- int x, y = 0;
- vout_thread_t * p_vout = getVout();
- if( !p_vout )
- return;
+ vlc_value_t looping,repeating;
+ playlist_t * p_playlist = pl_Get( VLCIntf );
- /* 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++;
- }
+ bool loop = var_GetBool( p_playlist, "loop" );
+ bool repeat = var_GetBool( p_playlist, "repeat" );
+ if( repeat ) {
+ [o_mainwindow setRepeatOne];
+ [o_mainmenu setRepeatOne];
+ } else if( loop ) {
+ [o_mainwindow setRepeatAll];
+ [o_mainmenu setRepeatAll];
+ } else {
+ [o_mainwindow setRepeatOff];
+ [o_mainmenu setRepeatOff];
}
- [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 );
+ [o_mainwindow setShuffle];
+ [o_mainmenu setShuffle];
}
-- (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];
- [o_embedded_window setScrollString: o_string];
-}
+#pragma mark -
+#pragma mark Other objects getters
-- (void)resetScrollField
+- (id)mainMenu
{
- playlist_t * p_playlist = pl_Get( 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;
- PL_LOCK;
- playlist_item_t * p_item = playlist_CurrentPlayingItem( p_playlist );
- if( input_item_GetNowPlaying( p_item->p_input ) )
- o_temp = [NSString stringWithUTF8String:input_item_GetNowPlaying( p_item->p_input )];
- else
- o_temp = [NSString stringWithUTF8String:p_item->p_input->psz_name];
- PL_UNLOCK;
- [self setScrollField: o_temp stopAfter:-1];
- [[[self controls] fspanel] setStreamTitle: o_temp];
- vlc_object_release( p_input );
- return;
- }
- [self setScrollField: _NS("VLC media player") stopAfter:-1];
+ return o_mainmenu;
}
-- (void)playStatusUpdated:(int)i_status
+- (id)controls
{
- if( i_status == PLAYING_S )
- {
- [[[self controls] fspanel] 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 controls] fspanel] 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")];
- }
-}
+ if( o_controls )
+ return o_controls;
-- (void)setSubmenusEnabled:(BOOL)b_enabled
-{
- [o_mi_program setEnabled: b_enabled];
- [o_mi_title setEnabled: b_enabled];
- [o_mi_chapter setEnabled: b_enabled];
- [o_mi_audiotrack setEnabled: b_enabled];
- [o_mi_visual setEnabled: b_enabled];
- [o_mi_videotrack setEnabled: b_enabled];
- [o_mi_subtitle setEnabled: b_enabled];
- [o_mi_channels setEnabled: b_enabled];
- [o_mi_deinterlace setEnabled: b_enabled];
- [o_mi_deinterlace_mode 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];
- [o_mi_teletext setEnabled: b_enabled];
+ return nil;
}
-- (IBAction)timesliderUpdate:(id)sender
+- (id)bookmarks
{
- float f_updated;
- playlist_t * p_playlist;
- input_thread_t * p_input;
+ if (!o_bookmarks )
+ o_bookmarks = [[VLCBookmarks alloc] init];
- switch( [[NSApp currentEvent] type] )
- {
- case NSLeftMouseUp:
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- f_updated = [sender floatValue];
- break;
-
- default:
- return;
- }
- p_playlist = pl_Get( p_intf );
- p_input = playlist_CurrentInput( p_playlist );
- if( p_input != NULL )
- {
- vlc_value_t time;
- vlc_value_t pos;
- NSString * o_time;
- char psz_time[MSTRTIME_MAX_SIZE];
-
- pos.f_float = f_updated / 10000.;
- var_Set( p_input, "position", pos );
- [o_timeslider setFloatValue: f_updated];
-
- var_Get( p_input, "time", &time );
-
- mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) );
- if( b_time_remaining && dur != -1 )
- {
- o_time = [NSString stringWithFormat: @"-%s", secstotimestr( psz_time, ((dur - time.i_time) / 1000000) )];
- }
- else
- o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
+ if( !nib_bookmarks_loaded )
+ nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner: NSApp];
- [o_timefield setStringValue: o_time];
- [[[self controls] fspanel] setStreamPos: f_updated andTime: o_time];
- [o_embedded_window setTime: o_time position: f_updated];
- vlc_object_release( p_input );
- }
+ return o_bookmarks;
}
-- (IBAction)timeFieldWasClicked:(id)sender
+- (id)open
{
- b_time_remaining = !b_time_remaining;
-}
-
+ if (!o_open)
+ return nil;
-#pragma mark -
-#pragma mark Recent Items
+ if (!nib_open_loaded)
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
-- (IBAction)clearRecentItems:(id)sender
-{
- [[NSDocumentController sharedDocumentController]
- clearRecentDocuments: nil];
+ return o_open;
}
-- (void)openRecentItem:(id)sender
+- (id)simplePreferences
{
- [self application: nil openFile: [sender title]];
-}
+ if (!o_sprefs)
+ o_sprefs = [[VLCSimplePrefs alloc] init];
-#pragma mark -
-#pragma mark Panels
+ if (!nib_prefs_loaded)
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
-- (IBAction)intfOpenFile:(id)sender
-{
- if( !nib_open_loaded )
- {
- nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [o_open awakeFromNib];
- [o_open openFile];
- } else {
- [o_open openFile];
- }
+ return o_sprefs;
}
-- (IBAction)intfOpenFileGeneric:(id)sender
+- (id)preferences
{
- if( !nib_open_loaded )
- {
- nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [o_open awakeFromNib];
- [o_open openFileGeneric];
- } else {
- [o_open openFileGeneric];
- }
-}
+ if( !o_prefs )
+ o_prefs = [[VLCPrefs alloc] init];
-- (IBAction)intfOpenDisc:(id)sender
-{
- if( !nib_open_loaded )
- {
- nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [o_open awakeFromNib];
- [o_open openDisc];
- } else {
- [o_open openDisc];
- }
-}
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
-- (IBAction)intfOpenNet:(id)sender
-{
- if( !nib_open_loaded )
- {
- nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [o_open awakeFromNib];
- [o_open openNet];
- } else {
- [o_open openNet];
- }
+ return o_prefs;
}
-- (IBAction)intfOpenCapture:(id)sender
+- (id)playlist
{
- if( !nib_open_loaded )
- {
- nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner: NSApp];
- [o_open awakeFromNib];
- [o_open openCapture];
- } else {
- [o_open openCapture];
- }
-}
+ if( o_playlist )
+ return o_playlist;
-- (IBAction)showWizard:(id)sender
-{
- if( !nib_wizard_loaded )
- {
- nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner: NSApp];
- [o_wizard initStrings];
- [o_wizard resetWizard];
- [o_wizard showWizard];
- } else {
- [o_wizard resetWizard];
- [o_wizard showWizard];
- }
+ return nil;
}
-- (IBAction)showExtended:(id)sender
+- (id)info
{
- if( o_extended == nil )
- o_extended = [[VLCExtended alloc] init];
+ if(! nib_info_loaded )
+ nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: NSApp];
- if( !nib_extended_loaded )
- nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner: NSApp];
+ if( o_info )
+ return o_info;
- [o_extended showPanel];
+ return nil;
}
-- (IBAction)showAudioEffects:(id)sender
+- (id)wizard
{
- if (!o_audioeffects)
- o_audioeffects = [[VLCAudioEffects alloc] init];
-
- if (!nib_audioeffects_loaded)
- nib_audioeffects_loaded = [NSBundle loadNibNamed:@"AudioEffects" owner:NSApp];
-
- [o_audioeffects toggleWindow:sender];
-}
+ if( !o_wizard )
+ o_wizard = [[VLCWizard alloc] init];
-- (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: NSApp];
[o_wizard initStrings];
}
-
- if( !nib_bookmarks_loaded )
- nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner: NSApp];
-
- [o_bookmarks showBookmarks];
+ return o_wizard;
}
-- (IBAction)viewPreferences:(id)sender
+- (id)getVideoViewAtPositionX: (int *)pi_x Y: (int *)pi_y withWidth: (unsigned int*)pi_width andHeight: (unsigned int*)pi_height
{
- if( !nib_prefs_loaded )
- {
- nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: NSApp];
- o_sprefs = [[VLCSimplePrefs alloc] init];
- o_prefs= [[VLCPrefs alloc] init];
- }
-
- [o_sprefs showSimplePrefs];
+ id videoView = [o_mainwindow videoView];
+ NSRect videoRect = [videoView frame];
+ int i_x = (int)videoRect.origin.x;
+ int i_y = (int)videoRect.origin.y;
+ unsigned int i_width = (int)videoRect.size.width;
+ unsigned int i_height = (int)videoRect.size.height;
+ pi_x = (int *)i_x;
+ pi_y = (int *)i_y;
+ pi_width = (unsigned int*)i_width;
+ pi_height = (unsigned int*)i_height;
+ msg_Dbg( VLCIntf, "returning videoview with x=%i, y=%i, width=%i, height=%i", i_x, i_y, i_width, i_height );
+ return videoView;
}
-#pragma mark -
-#pragma mark Help and Docs
-
-- (IBAction)viewAbout:(id)sender
+- (void)setNativeVideoSize:(NSSize)size
{
- if( !nib_about_loaded )
- nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp];
-
- [o_about showAbout];
+ [o_mainwindow setNativeVideoSize:size];
}
-- (IBAction)showLicense:(id)sender
+- (id)embeddedList
{
- if( !nib_about_loaded )
- nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp];
-
- [o_about showGPL: sender];
-}
+ if( o_embedded_list )
+ return o_embedded_list;
-- (IBAction)viewHelp:(id)sender
-{
- if( !nib_about_loaded )
- {
- nib_about_loaded = [NSBundle loadNibNamed:@"About" owner: NSApp];
- [o_about showHelp];
- }
- else
- [o_about showHelp];
+ return nil;
}
-- (IBAction)openReadMe:(id)sender
+- (id)coreDialogProvider
{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"README.MacOSX" ofType: @"rtf"];
+ if( o_coredialogs )
+ return o_coredialogs;
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"TextEdit"];
+ return nil;
}
-- (IBAction)openDocumentation:(id)sender
+- (id)eyeTVController
{
- NSURL * o_url = [NSURL URLWithString:
- @"http://www.videolan.org/doc/"];
+ if( o_eyetv )
+ return o_eyetv;
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ return nil;
}
-- (IBAction)openWebsite:(id)sender
+- (id)appleRemoteController
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
-
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ return o_remote;
}
-- (IBAction)openForum:(id)sender
+- (void)setActiveVideoPlayback:(BOOL)b_value
{
- NSURL * o_url = [NSURL URLWithString: @"http://forum.videolan.org/"];
-
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ b_active_videoplayback = b_value;
+ [o_mainwindow setVideoplayEnabled];
+ [o_mainwindow togglePlaylist:nil];
}
-- (IBAction)openDonate:(id)sender
+- (BOOL)activeVideoPlayback
{
- NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/contribute.html#paypal"];
-
- [[NSWorkspace sharedWorkspace] openURL: o_url];
+ return b_active_videoplayback;
}
#pragma mark -
#pragma mark -
#pragma mark Errors, warnings and messages
-
-- (IBAction)viewErrorsAndWarnings:(id)sender
-{
- [[[self coreDialogProvider] errorPanel] 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: NSApp];
-
- [o_info initPanel];
-}
-
- (void)windowDidBecomeKey:(NSNotification *)o_notification
{
if( [o_notification object] == o_msgs_panel )
}
}
-- (void)libvlcMessageReceived: (NSNotification *)o_notification
+- (void)processReceivedlibvlcMessage:(const msg_item_t *) item ofType: (int)i_type withStr: (char *)str
{
NSColor *o_white = [NSColor whiteColor];
NSColor *o_red = [NSColor redColor];
NSColor *o_gray = [NSColor grayColor];
NSColor * pp_color[4] = { o_white, o_red, o_yellow, o_gray };
- static const char * ppsz_type[4] = { ": ", " error: ",
- " warning: ", " debug: " };
+ static const char * ppsz_type[4] = { ": ", " error: ", " warning: ", " debug: " };
- NSString *o_msg;
NSDictionary *o_attr;
NSAttributedString *o_msg_color;
- int i_type = [[[o_notification userInfo] objectForKey: @"Type"] intValue];
-
[o_msg_lock lock];
if( [o_msg_arr count] + 2 > 600 )
[o_msg_arr removeObjectAtIndex: 1];
}
- o_attr = [NSDictionary dictionaryWithObject: o_gray
- forKey: NSForegroundColorAttributeName];
- o_msg = [NSString stringWithFormat: @"%@%s",
- [[o_notification userInfo] objectForKey: @"Module"],
- ppsz_type[i_type]];
- o_msg_color = [[NSAttributedString alloc]
- initWithString: o_msg attributes: o_attr];
+ o_attr = [NSDictionary dictionaryWithObject: o_gray forKey: NSForegroundColorAttributeName];
+ o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s%s", item->psz_module, ppsz_type[i_type]] attributes: o_attr];
[o_msg_arr addObject: [o_msg_color autorelease]];
- o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type]
- forKey: NSForegroundColorAttributeName];
- o_msg = [[[o_notification userInfo] objectForKey: @"Message"] stringByAppendingString: @"\n"];
- o_msg_color = [[NSAttributedString alloc]
- initWithString: o_msg attributes: o_attr];
+ o_attr = [NSDictionary dictionaryWithObject: pp_color[i_type] forKey: NSForegroundColorAttributeName];
+ o_msg_color = [[NSAttributedString alloc] initWithString: [NSString stringWithFormat: @"%s\n", str] attributes: o_attr];
[o_msg_arr addObject: [o_msg_color autorelease]];
b_msg_arr_changed = YES;
[o_msg_lock unlock];
+
+ [self updateMessageDisplay];
}
- (IBAction)saveDebugLog:(id)sender
{
- NSOpenPanel * saveFolderPanel = [[NSSavePanel alloc] init];
+ NSSavePanel * saveFolderPanel = [[NSSavePanel alloc] init];
- [saveFolderPanel setCanChooseDirectories: NO];
- [saveFolderPanel setCanChooseFiles: YES];
[saveFolderPanel setCanSelectHiddenExtension: NO];
[saveFolderPanel setCanCreateDirectories: YES];
[saveFolderPanel setAllowedFileTypes: [NSArray arrayWithObject:@"rtfd"]];
#pragma mark -
#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];
-
[[self playlist] outlineViewSelectionDidChange: NULL];
}
-- (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 contentRectForFrameRect:[o_window frame]].size.height > 169. && 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_title isEqualToString: _NS("Clear Menu")] )
- {
- NSMenu * o_menu = [o_mi_open_recent submenu];
- int i_nb_items = [o_menu numberOfItems];
- NSArray * o_docs = [[NSDocumentController sharedDocumentController]
- recentDocumentURLs];
- UInt32 i_nb_docs = [o_docs count];
-
- if( i_nb_items > 1 )
- {
- while( --i_nb_items )
- {
- [o_menu removeItemAtIndex: 0];
- }
- }
-
- if( i_nb_docs > 0 )
- {
- NSURL * o_url;
- NSString * o_doc;
-
- [o_menu insertItem: [NSMenuItem separatorItem] atIndex: 0];
-
- while( TRUE )
- {
- i_nb_docs--;
-
- o_url = [o_docs objectAtIndex: i_nb_docs];
-
- if( [o_url isFileURL] )
- {
- o_doc = [o_url path];
- }
- else
- {
- o_doc = [o_url absoluteString];
- }
-
- [o_menu insertItemWithTitle: o_doc
- action: @selector(openRecentItem:)
- keyEquivalent: @"" atIndex: 0];
-
- if( i_nb_docs == 0 )
- {
- break;
- }
- }
- }
- else
- {
- bEnabled = FALSE;
- }
- }
- return( bEnabled );
-}
-
-@end
-
@implementation VLCMain (Internal)
- (void)handlePortMessage:(NSPortMessage *)o_msg
- (void)coreChangedMediaKeySupportSetting: (NSNotification *)o_notification
{
b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
- [o_mediaKeyController setShouldInterceptMediaKeyEvents:b_mediaKeySupport];
+ if (b_mediaKeySupport) {
+ if (!o_mediaKeyController)
+ o_mediaKeyController = [[SPMediaKeyTap alloc] initWithDelegate:self];
+ [o_mediaKeyController startWatchingMediaKeys];
+ }
+ else if (!b_mediaKeySupport && o_mediaKeyController)
+ {
+ int returnedValue = NSRunInformationalAlertPanel(_NS("Relaunch required"),
+ _NS("To make sure that VLC no longer listens to your media key events, it needs to be restarted."),
+ _NS("Relaunch VLC"), _NS("Ignore"), nil, nil);
+ if( returnedValue == NSOKButton )
+ {
+ /* Relaunch now */
+ const char * path = [[[NSBundle mainBundle] executablePath] UTF8String];
+
+ /* For some reason we need to fork(), not just execl(), which reports a ENOTSUP then. */
+ if(fork() != 0)
+ {
+ exit(0);
+ return;
+ }
+ execl(path, path, NULL);
+ }
+ }
}
@end
// but we need to send a stop: to properly exits libvlc.
// However, we are not able to change the action-method sent by this standard menu item.
// thus we override terminat: to send a stop:
-// see [af97f24d528acab89969d6541d83f17ce1ecd580] that introduced the removal of setjmp() and longjmp()
+// see [af97f24d528acab89969d6541d83f17ce1ecd580] that introduced the removal of setjmp() and longjmp()
- (void)terminate:(id)sender
{
[self activateIgnoringOtherApps:YES];
projects / vlc / blobdiff