#include <vlc_keys.h>
#include <vlc_dialog.h>
#include <unistd.h> /* execl() */
-#import <vlc_dialog.h>
#import "intf.h"
#import "fspanel.h"
#import "bookmarks.h"
#import "coredialogs.h"
#import "embeddedwindow.h"
-#import "update.h"
#import "AppleRemote.h"
#import "eyetv.h"
#import "simple_prefs.h"
#import "vlm.h"
-#import <AddressBook/AddressBook.h>
+#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 );
}
/* Install a jmpbuffer to where we can go back before the NSApp exit
* see applicationWillTerminate: */
- [NSApplication sharedApplication];
+ [VLCApplication sharedApplication];
[[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
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;
+
+ 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:p_dialog];
- [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewCoreDialogEventNotification" object:[interface getCoreDialogProvider] userInfo:[NSDictionary dictionaryWithObjectsAndKeys: o_value, @"VLCDialogPointer", [NSString stringWithUTF8String: type], @"VLCDialogType", nil]];
+ 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 Helpers
+
+input_thread_t *getInput(void)
+{
+ intf_thread_t *p_intf = VLCIntf;
+ if (!p_intf)
+ return NULL;
+ return pl_CurrentInput(p_intf);
+}
+
+vout_thread_t *getVout(void)
+{
+ input_thread_t *p_input = getInput();
+ if (!p_input)
+ return NULL;
+ vout_thread_t *p_vout = input_GetVout(p_input);
+ vlc_object_release(p_input);
+ return p_vout;
+}
+
+aout_instance_t *getAout(void)
+{
+ input_thread_t *p_input = getInput();
+ if (!p_input)
+ return NULL;
+ aout_instance_t *p_aout = input_GetAout(p_input);
+ vlc_object_release(p_input);
+ return p_aout;
+}
+
#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];
o_embedded_list = [[VLCEmbeddedList alloc] init];
o_coredialogs = [[VLCCoreDialogProvider alloc] init];
o_info = [[VLCInfo alloc] init];
-#ifdef UPDATE_CHECK
- o_update = [[VLCUpdate alloc] init];
-#endif
i_lastShownVolume = -1;
p_intf = p_mainintf;
}
-- (intf_thread_t *)getIntf {
+- (intf_thread_t *)intf {
return p_intf;
}
playlist_t *p_playlist;
vlc_value_t val;
- /* Check if we already did this once. Opening the other nibs calls it too, because VLCMain is the owner */
- if( nib_main_loaded ) return;
+ if( !p_intf ) return;
- /* check whether the user runs a valid version of OS X */
- if( MACOS_VERSION < 10.5f )
- {
- NSAlert *ourAlert;
- int i_returnValue;
- NSString *o_blabla;
- if( MACOS_VERSION == 10.4f )
- o_blabla = _NS("VLC's last release for your OS is the 0.9 series." );
- else if( MACOS_VERSION == 10.3f )
- o_blabla = _NS("VLC's last release for your OS is VLC 0.8.6i, which is prone to known security issues." );
- else // 10.2 and 10.1, still 3% of the OS X market share
- o_blabla = _NS("VLC's last release for your OS is VLC 0.7.2, which is highly out of date and prone to " \
- "known security issues. We recommend you to update your Mac to a modern version of Mac OS X.");
- ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is no longer supported")
- defaultButton: _NS("Quit")
- alternateButton: NULL
- otherButton: NULL
- informativeTextWithFormat: _NS("VLC media player %s requires Mac OS X 10.5 or higher.\n\n%@"), VLC_Version(), o_blabla];
- [ourAlert setAlertStyle: NSCriticalAlertStyle];
- i_returnValue = [ourAlert runModal];
- [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO];
- 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;
[self initStrings];
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
{
- [self _removeOldPreferences];
-
-#ifdef UPDATE_CHECK
- /* Check for update silently on startup */
- if( !nib_update_loaded )
- nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner: NSApp];
+ if( !p_intf ) return;
- if([o_update shouldCheckForUpdate])
- [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:nil];
-#endif
+ [self _removeOldPreferences];
/* Handle sleep notification */
[[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
- (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 */
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 getConfigChanged])
+ if(o_extended && [o_extended configChanged])
{
[o_extended savePrefs];
}
/* 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];
- [o_update end];
-
/* release some other objects here, because it isn't sure whether dealloc
* will be called later on */
if( nib_about_loaded )
/* 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
{
- [o_remote startListening: self];
+ if( !p_intf ) return;
+ if( config_GetInt( p_intf, "macosx-appleremote" ) == YES )
+ [o_remote startListening: self];
}
- (void)applicationDidResignActive:(NSNotification *)aNotification
{
+ if( !p_intf ) return;
[o_remote stopListening: self];
}
- (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;
#pragma mark -
#pragma mark Other objects getters
-// FIXME: this is ugly and does not respect cocoa naming scheme
-- (id)getControls
+- (id)controls
{
if( o_controls )
return o_controls;
return nil;
}
-- (id)getSimplePreferences
+- (id)simplePreferences
{
if( !o_sprefs )
return nil;
return o_sprefs;
}
-- (id)getPreferences
+- (id)preferences
{
if( !o_prefs )
return nil;
return o_prefs;
}
-- (id)getPlaylist
+- (id)playlist
{
if( o_playlist )
return o_playlist;
return ![o_btn_playlist state];
}
-- (id)getInfo
+- (id)info
{
if( o_info )
return o_info;
return nil;
}
-- (id)getWizard
+- (id)wizard
{
if( o_wizard )
return o_wizard;
return nil;
}
-- (id)getVLM
+- (id)vlm
{
return o_vlm;
}
-- (id)getBookmarks
+- (id)bookmarks
{
if( o_bookmarks )
return o_bookmarks;
return nil;
}
-- (id)getEmbeddedList
+- (id)embeddedList
{
if( o_embedded_list )
return o_embedded_list;
return nil;
}
-- (id)getCoreDialogProvider
+- (id)coreDialogProvider
{
if( o_coredialogs )
return o_coredialogs;
return nil;
}
-- (id)getMainIntfPgbar
+- (id)mainIntfPgbar
{
if( o_main_pgbar )
return o_main_pgbar;
return nil;
}
-- (id)getControllerWindow
+- (id)controllerWindow
{
if( o_window )
return o_window;
return nil;
}
-- (id)getVoutMenu
+- (id)voutMenu
{
return o_vout_menu;
}
-- (id)getEyeTVController
+- (id)eyeTVController
{
if( o_eyetv )
return o_eyetv;
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 )
{
playlist_t * p_playlist = pl_Hold( p_intf );
- /* TODO: fix i_size use */
- b_plmul = p_playlist->items.i_size > 1;
+ 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 ) ) )
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 getInfo] 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];
[o_timefield setStringValue: @"00:00"];
- [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"00:00"];
- [[[self getControls] getFSPanel] setSeekable: b_seekable];
+ [[[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;
if( p_intf->p_sys->b_intf_show )
{
if( [[o_controls voutView] isFullscreen] && config_GetInt( VLCIntf, "macosx-fspanel" ) )
- [[o_controls getFSPanel] fadeIn];
+ [[o_controls fspanel] fadeIn];
else
[o_window makeKeyAndOrderFront: self];
free(name);
[self setScrollField: aString stopAfter:-1];
- [[[self getControls] getFSPanel] setStreamTitle: aString];
+ [[[self controls] fspanel] setStreamTitle: aString];
[[o_controls voutView] updateTitle];
[o_playlist updateRowSelection];
+
p_intf->p_sys->b_current_title_update = FALSE;
}
o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
[o_timefield setStringValue: o_time];
- [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
+ [[[self controls] fspanel] setStreamPos: f_updated andTime: o_time];
[o_embedded_window setTime: o_time position: f_updated];
}
i_volume_step = config_GetInt( p_intf->p_libvlc, "volume-step" );
[o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
[o_volumeslider setEnabled: TRUE];
- [[[self getControls] getFSPanel] setVolumeLevel: (float)i_lastShownVolume / i_volume_step];
+ [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;
}
var: "video-device" selector: @selector(toggleVar:)];
[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:
+ 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:)];
- vlc_object_release(p_dec_obj);
- }
#endif
vlc_object_release( (vlc_object_t *)p_vout );
}
- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
{
- int x,y = 0;
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- if(! p_vout )
+ int x, y = 0;
+ vout_thread_t * p_vout = getVout();
+ if( !p_vout )
return;
/* clean the menu before adding new entries */
else
i_end_scroll = -1;
[o_scrollfield setStringValue: o_string];
+ [o_embedded_window setScrollString: o_string];
}
- (void)resetScrollField
o_temp = [NSString stringWithUTF8String:p_item->p_input->psz_name];
PL_UNLOCK;
[self setScrollField: o_temp stopAfter:-1];
- [[[self getControls] getFSPanel] setStreamTitle: o_temp];
+ [[[self controls] fspanel] setStreamTitle: o_temp];
vlc_object_release( p_input );
pl_Release( p_intf );
return;
{
if( i_status == PLAYING_S )
{
- [[[self getControls] getFSPanel] setPause];
+ [[[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")];
}
else
{
- [[[self getControls] getFSPanel] setPlay];
+ [[[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_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (time.i_time / 1000000) )];
[o_timefield setStringValue: o_time];
- [[[self getControls] getFSPanel] setStreamPos: f_updated andTime: 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 );
}
[o_sprefs showSimplePrefs];
}
-#pragma mark -
-#pragma mark Update
-
-- (IBAction)checkForUpdate:(id)sender
-{
-#ifdef UPDATE_CHECK
- if( !nib_update_loaded )
- nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner: NSApp];
- [o_update showUpdateWindow];
-#else
- msg_Err( VLCIntf, "Update checker wasn't enabled in this build" );
- dialog_FatalWait( VLCIntf, _("Update check failed"), _("Checking for updates was not enabled in this build.") );
-#endif
-}
-
#pragma mark -
#pragma mark Help and Docs
- (void)connectionDidFinishLoading:(NSURLConnection *)connection
{
- NSRunInformationalAlertPanel(_NS("Crash Report successfully sent"),
- _NS("Thanks for your report!"),
- _NS("OK"), nil, nil, nil);
[crashLogURLConnection release];
crashLogURLConnection = nil;
}
- (IBAction)viewErrorsAndWarnings:(id)sender
{
- [[[self getCoreDialogProvider] getErrorPanel] showPanel];
+ [[[self coreDialogProvider] errorPanel] showPanel];
}
- (IBAction)showMessagesPanel:(id)sender
[o_msg_lock lock];
- if( [o_msg_arr count] + 2 > 400 )
+ if( [o_msg_arr count] + 2 > 600 )
{
- unsigned rid[] = { 0, 1 };
- [o_msg_arr removeObjectsFromIndices: (unsigned *)&rid
- numIndices: sizeof(rid)/sizeof(rid[0])];
+ [o_msg_arr removeObjectAtIndex: 0];
+ [o_msg_arr removeObjectAtIndex: 1];
}
o_attr = [NSDictionary dictionaryWithObject: o_gray
else
[o_btn_playlist setState: YES];
- [[self getPlaylist] outlineViewSelectionDidChange: NULL];
+ [[self playlist] outlineViewSelectionDidChange: NULL];
}
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
}
@end
+
+/*****************************************************************************
+ * VLCApplication interface
+ * exclusively used to implement media key support on Al Apple keyboards
+ * b_justJumped is required as the keyboard send its events faster than
+ * the user can actually jump through his media
+ *****************************************************************************/
+
+@implementation VLCApplication
+
+- (void)awakeFromNib
+{
+ 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];
+}
+
+- (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" );
+}
+
+
+- (void)sendEvent: (NSEvent*)event
+{
+ if( b_active )
+ {
+ 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);
+
+ if( keyCode == NX_KEYTYPE_PLAY && keyState == 0 )
+ var_SetInteger( VLCIntf->p_libvlc, "key-action", ACTIONID_PLAY_PAUSE );
+
+ 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 )
+ {
+ 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];
+}
+
+- (void)resetJump
+{
+ b_justJumped = NO;
+}
+
+@end