#import <AddressBook/AddressBook.h> /* for crashlog send mechanism */
#import <IOKit/hidsystem/ev_keymap.h> /* for the media key support */
+#import <Sparkle/Sparkle.h> /* we're the update delegate */
/*****************************************************************************
* Local prototypes.
static unichar VLCKeyToCocoa( unsigned int i_key );
static unsigned int VLCModifiersToCocoa( unsigned int i_key );
+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 );
+
#pragma mark -
#pragma mark VLC Interface Object Callbacks
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
- p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
-
/* subscribe to LibVLCCore's messages */
p_intf->p_sys->p_sub = msg_Subscribe( p_intf->p_libvlc, MsgCallback, NULL );
p_intf->pf_run = Run;
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
- [p_intf->p_sys->o_pool release];
-
free( p_intf->p_sys );
}
vlc_restorecancel( canc );
}
-
/*****************************************************************************
* playlistChanged: Callback triggered by the intf-change playlist
* variable, to let the intf update the playlist.
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
VLCMain *interface = (VLCMain *)data;
- const dialog_fatal_t *p_dialog = (const dialog_fatal_t *)value.p_address;
+ if( [[NSString stringWithUTF8String: type] isEqualToString: @"dialog-progress-bar"] )
+ {
+ /* the progress panel needs to update itself and therefore wants special treatment within this context */
+ dialog_progress_bar_t *p_dialog = (dialog_progress_bar_t *)value.p_address;
- NSValue *o_value = [NSValue valueWithPointer:p_dialog];
+ p_dialog->pf_update = updateProgressPanel;
+ p_dialog->pf_check = checkProgressPanel;
+ p_dialog->pf_destroy = destroyProgressPanel;
+ p_dialog->p_sys = VLCIntf->p_libvlc;
+ }
+
+ 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]];
[o_pool release];
return VLC_SUCCESS;
}
+void updateProgressPanel (void *priv, const char *text, float value)
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+
+ NSString *o_txt;
+ if( text != NULL )
+ o_txt = [NSString stringWithUTF8String: text];
+ else
+ o_txt = @"";
+
+ [[[VLCMain sharedInstance] coreDialogProvider] updateProgressPanelWithText: o_txt andNumber: (double)(value * 1000.)];
+
+ [o_pool release];
+}
+
+void destroyProgressPanel (void *priv)
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ [[[VLCMain sharedInstance] coreDialogProvider] destroyProgressPanel];
+ [o_pool release];
+}
+
+bool checkProgressPanel (void *priv)
+{
+ NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
+ return [[[VLCMain sharedInstance] coreDialogProvider] progressCancelled];
+ [o_pool release];
+}
+
#pragma mark -
#pragma mark Private
else
_o_sharedMainInstance = [super init];
+ p_intf = NULL;
+
o_msg_lock = [[NSLock alloc] init];
- o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
+ 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];
i_lastShownVolume = -1;
-#ifndef __x86_64__
o_remote = [[AppleRemote alloc] init];
[o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
[o_remote setDelegate: _o_sharedMainInstance];
-#endif
o_eyetv = [[VLCEyeTVController alloc] init];
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( !p_intf ) return;
+
+ /* Check if we already did this once. Opening the other nibs calls it too,
+ because VLCMain is the owner */
if( nib_main_loaded ) return;
/* check whether the user runs a valid version of OS X */
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)];
+ i_key = config_GetInt( p_intf, "key-random" );
+ [o_mi_random setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_random setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-zoom-half" );
+ [o_mi_half_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_half_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-zoom-original" );
+ [o_mi_normal_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_normal_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-zoom-double" );
+ [o_mi_double_window setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_double_window setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
nib_coredialogs_loaded = [NSBundle loadNibNamed:@"CoreDialogs" owner: NSApp];
/* subscribe to various interactive dialogues */
- var_Create( p_intf, "dialog-fatal", VLC_VAR_ADDRESS );
- var_AddCallback( p_intf, "dialog-fatal", DialogCallback, self );
+ var_Create( p_intf, "dialog-error", VLC_VAR_ADDRESS );
+ var_AddCallback( p_intf, "dialog-error", DialogCallback, self );
+ var_Create( p_intf, "dialog-critical", VLC_VAR_ADDRESS );
+ var_AddCallback( p_intf, "dialog-critical", DialogCallback, self );
var_Create( p_intf, "dialog-login", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "dialog-login", DialogCallback, self );
var_Create( p_intf, "dialog-question", VLC_VAR_ADDRESS );
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
{
+ if( !p_intf ) return;
+
/* FIXME: don't poll */
interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
target: self selector: @selector(manageIntf:)
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
+ if( !p_intf ) return;
+
[self _removeOldPreferences];
#ifdef UPDATE_CHECK
- (void)initStrings
{
+ if( !p_intf ) return;
+
[o_window setTitle: _NS("VLC media player")];
[self setScrollField:_NS("VLC media player") stopAfter:-1];
[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_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_equalizer setTitle: _NS("Equalizer...")];
[o_mi_extended setTitle: _NS("Extended Controls...")];
- (void)releaseRepresentedObjects:(NSMenu *)the_menu
{
+ if( !p_intf ) return;
+
NSArray *menuitems_array = [the_menu itemArray];
for( int i=0; i<[menuitems_array count]; i++ )
{
vout_thread_t * p_vout;
int returnedValue = 0;
+ if( !p_intf ) return;
+
msg_Dbg( p_intf, "Terminating" );
/* Make sure the manage_thread won't call -terminate: again */
/* unsubscribe from the interactive dialogues */
dialog_Unregister( p_intf );
- var_DelCallback( p_intf, "dialog-fatal", DialogCallback, self );
+ var_DelCallback( p_intf, "dialog-error", DialogCallback, self );
+ var_DelCallback( p_intf, "dialog-critical", DialogCallback, self );
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 );
/* remove global observer watching for vout device changes correctly */
[[NSNotificationCenter defaultCenter] removeObserver: self];
+#ifdef UPDATE_CHECK
[o_update end];
+#endif
/* release some other objects here, because it isn't sure whether dealloc
* will be called later on */
/* not reached */
}
+#pragma mark -
+#pragma mark Sparkle delegate
+/* received directly before the update gets installed, so let's shut down a bit */
+- (void)updater:(SUUpdater *)updater willInstallUpdate:(SUAppcastItem *)update
+{
+ [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
{
NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
-
if( [itemIdentifier isEqual: VLCToolbarMediaControl] )
{
[toolbarItem setLabel:@"Media Controls"];
application */
- (void)applicationDidBecomeActive:(NSNotification *)aNotification
{
-#ifndef __x86_64__
- [o_remote startListening: self];
-#endif
+ if( !p_intf ) return;
+ if( config_GetInt( p_intf, "macosx-appleremote" ) == YES )
+ [o_remote startListening: self];
}
- (void)applicationDidResignActive:(NSNotification *)aNotification
{
-#ifndef __x86_64__
+ if( !p_intf ) return;
[o_remote stopListening: self];
-#endif
}
/* Triggered when the computer goes to sleep */
- (void)computerWillSleep: (NSNotification *)notification
{
/* Pause */
- if( p_intf->p_sys->i_play_status == PLAYING_S )
+ if( p_intf && p_intf->p_sys->i_play_status == PLAYING_S )
{
- vlc_value_t val;
- val.i_int = config_GetInt( p_intf, "key-play-pause" );
- var_Set( p_intf->p_libvlc, "key-pressed", val );
+ var_SetInteger( p_intf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
}
}
unichar key = 0;
vlc_value_t val;
unsigned int i_pressed_modifiers = 0;
- struct hotkey *p_hotkeys;
+ const struct hotkey *p_hotkeys;
int i;
val.i_int = 0;
return nil;
}
+- (id)appleRemoteController
+{
+ return o_remote;
+}
+
#pragma mark -
#pragma mark Polling
id self = manage_cleanup_stack->self;
playlist_t * p_playlist = manage_cleanup_stack->p_playlist;
- 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 );
+ 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 );
pl_Release( p_intf );
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
- aout_VolumeGet( p_intf, &i_volume );
+ playlist_t * p_playlist = pl_Hold( p_intf );
+
+ aout_VolumeGet( p_playlist, &i_volume );
+ pl_Release( p_intf );
if( i_volume != i_lastShownVolume )
{
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_Hold( 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];
+ pl_Release( p_intf );
+ }
}
if( p_intf->p_sys->b_intf_update )
{
b_buffering = YES;
}
- /* 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 )
- {
- PL_LOCK;
- [[self info] updatePanelWithItem: playlist_CurrentPlayingItem( p_playlist )->p_input];
- PL_UNLOCK;
- }
-
/* seekable streams */
b_seekable = var_GetBool( p_input, "can-seek" );
}
[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];
[[[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;
[[o_controls voutView] updateTitle];
[o_playlist updateRowSelection];
+
p_intf->p_sys->b_current_title_update = FALSE;
}
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;
[o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
var: "deinterlace" selector: @selector(toggleVar:)];
-#if 0
-/* FIXME Post processing. */
- 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:
+#if 1
+ [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
+ (vlc_object_t *)p_vout var:"postprocess" selector:
@selector(toggleVar:)];
- vlc_object_release(p_dec_obj);
- }
#endif
vlc_object_release( (vlc_object_t *)p_vout );
}
else
i_end_scroll = -1;
[o_scrollfield setStringValue: o_string];
+ [o_embedded_window setScrollString: o_string];
}
- (void)resetScrollField
if( [o_msg_arr count] + 2 > 600 )
{
- [o_msg_arr removeObjectAtIndex: 0];
+ [o_msg_arr removeObjectAtIndex: 0];
[o_msg_arr removeObjectAtIndex: 1];
- }
+ }
o_attr = [NSDictionary dictionaryWithObject: o_gray
forKey: NSForegroundColorAttributeName];
@implementation VLCApplication
-- (void)sendEvent: (NSEvent*)event
+- (void)awakeFromNib
{
- if( [event type] == NSSystemDefined && [event subtype] == 8 )
- {
- int keyCode = (([event data1] & 0xFFFF0000) >> 16);
- int keyFlags = ([event data1] & 0x0000FFFF);
- int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA;
- int keyRepeat = (keyFlags & 0x1);
+ b_active = b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
+ b_activeInBackground = config_GetInt( VLCIntf, "macosx-mediakeys-background" );
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(coreChangedMediaKeySupportSetting:) name: @"VLCMediaKeySupportSettingChanged" object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(appGotActiveOrInactive:) name: @"NSApplicationDidBecomeActiveNotification" object: nil];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(appGotActiveOrInactive:) name: @"NSApplicationWillResignActiveNotification" object: nil];
+}
- if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 )
- var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+- (void)dealloc
+{
+ [[NSNotificationCenter defaultCenter] removeObserver: self];
+ [super dealloc];
+}
+
+- (void)appGotActiveOrInactive: (NSNotification *)o_notification
+{
+ if(( [[o_notification name] isEqualToString: @"NSApplicationWillResignActiveNotification"] && !b_activeInBackground ) || !b_mediaKeySupport)
+ b_active = NO;
+ else
+ b_active = YES;
+}
+
+- (void)coreChangedMediaKeySupportSetting: (NSNotification *)o_notification
+{
+ b_active = b_mediaKeySupport = config_GetInt( VLCIntf, "macosx-mediakeys" );
+ b_activeInBackground = config_GetInt( VLCIntf, "macosx-mediakeys-background" );
+}
- if( keyCode == NX_KEYTYPE_FAST && !b_justJumped )
- {
- if( keyState == 0 && keyRepeat == 0 )
- {
- var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_NEXT );
- }
- else if( keyRepeat == 1 )
- {
- var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT );
- b_justJumped = YES;
- [self performSelector:@selector(resetJump)
- withObject: NULL
- afterDelay:0.25];
- }
- }
- if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped )
+- (void)sendEvent: (NSEvent*)event
+{
+ if( b_active )
+ {
+ if( [event type] == NSSystemDefined && [event subtype] == 8 )
{
- if( keyState == 0 && keyRepeat == 0 )
+ int keyCode = (([event data1] & 0xFFFF0000) >> 16);
+ int keyFlags = ([event data1] & 0x0000FFFF);
+ int keyState = (((keyFlags & 0xFF00) >> 8)) == 0xA;
+ int keyRepeat = (keyFlags & 0x1);
+
+ if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 )
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+
+ if( keyCode == NX_KEYTYPE_FAST && !b_justJumped )
{
- var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV );
+ if( keyState == 0 && keyRepeat == 0 )
+ {
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_NEXT );
+ }
+ else if( keyRepeat == 1 )
+ {
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_FORWARD_SHORT );
+ b_justJumped = YES;
+ [self performSelector:@selector(resetJump)
+ withObject: NULL
+ afterDelay:0.25];
+ }
}
- else if( keyRepeat == 1 )
+
+ if( keyCode == NX_KEYTYPE_REWIND && !b_justJumped )
{
- var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT );
- b_justJumped = YES;
- [self performSelector:@selector(resetJump)
- withObject: NULL
- afterDelay:0.25];
+ if( keyState == 0 && keyRepeat == 0 )
+ {
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PREV );
+ }
+ else if( keyRepeat == 1 )
+ {
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_JUMP_BACKWARD_SHORT );
+ b_justJumped = YES;
+ [self performSelector:@selector(resetJump)
+ withObject: NULL
+ afterDelay:0.25];
+ }
}
}
- }
+ }
[super sendEvent: event];
}
projects / vlc / blobdiff