#import "wizard.h"
#import "extended.h"
#import "bookmarks.h"
-#import "interaction.h"
+#import "coredialogs.h"
#import "embeddedwindow.h"
#import "update.h"
#import "AppleRemote.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 */
/*****************************************************************************
* 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
/* 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];
{
int canc = vlc_savecancel();
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
- NSDictionary *o_dict = [NSDictionary dictionaryWithObjects:
- [NSArray arrayWithObjects:
- [NSString stringWithUTF8String: item->psz_module],
- [NSString stringWithUTF8String: item->psz_msg],
- [NSNumber numberWithInt: item->i_type], nil]
- forKeys:
- [NSArray arrayWithObjects: @"Module", @"Message", @"Type", nil]];
-
+
+ /* this may happen from time to time, let's bail out as info would be useless anyway */
+ if( !item->psz_module || !item->psz_msg )
+ 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];
-
+
[o_pool release];
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;
- NSLog( @"dialog callback triggered; type of dialogue is '%s'", type );
-
- 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]];
+ 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
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];
p_intf = p_mainintf;
}
-- (intf_thread_t *)getIntf {
+- (intf_thread_t *)intf {
return p_intf;
}
[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...")];
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];
}
/* 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 */
application */
- (void)applicationDidBecomeActive:(NSNotification *)aNotification
{
+#ifndef __x86_64__
[o_remote startListening: self];
+#endif
}
- (void)applicationDidResignActive:(NSNotification *)aNotification
{
+#ifndef __x86_64__
[o_remote stopListening: self];
+#endif
}
/* Triggered when the computer goes to sleep */
#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;
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;
}
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 );
}
- (IBAction)showBookmarks:(id)sender
{
- dialog_Fatal( p_intf, "Title", "Message" );
-
/* we need the wizard-nib for the bookmarks's extract functionality */
if( !nib_wizard_loaded )
{
- (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
forKey: NSForegroundColorAttributeName];
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)sendEvent: (NSEvent*)event
+{
+ 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