* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
- *
+ *
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
#import "embeddedwindow.h"
#import "update.h"
#import "AppleRemote.h"
+#import "eyetv.h"
#import <vlc_input.h>
/*****************************************************************************
* Run: main loop
*****************************************************************************/
+jmp_buf jmpbuffer;
+
static void Run( intf_thread_t *p_intf )
{
+ sigset_t set;
+
/* Do it again - for some unknown reason, vlc_thread_create() often
* fails to go to real-time priority with the first launched thread
* (???) --Meuuh */
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+
+ /* Make sure the "force quit" menu item does quit instantly.
+ * VLC overrides SIGTERM which is sent by the "force quit"
+ * menu item to make sure deamon mode quits gracefully, so
+ * we un-override SIGTERM here. */
+ sigemptyset( &set );
+ sigaddset( &set, SIGTERM );
+ pthread_sigmask( SIG_UNBLOCK, &set, NULL );
+
[[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
- [NSApp run];
- [[VLCMain sharedInstance] terminate];
+
+ /* Install a jmpbuffer to where we can go back before the NSApp exit
+ * see applicationWillTerminate: */
+ if(setjmp(jmpbuffer) == 0)
+ [NSApp run];
}
int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
p_intf->p_sys->b_playlist_update = VLC_TRUE;
p_intf->p_sys->b_intf_update = VLC_TRUE;
p_intf->p_sys->b_playmode_update = VLC_TRUE;
+ p_intf->p_sys->b_current_title_update = VLC_TRUE;
return VLC_SUCCESS;
}
VLCMain *interface = (VLCMain *)param;
interaction_dialog_t *p_dialog = (interaction_dialog_t *)(new_val.p_address);
NSValue *o_value = [NSValue valueWithPointer:p_dialog];
-
+
[[NSNotificationCenter defaultCenter] postNotificationName: @"VLCNewInteractionEventNotification" object:[interface getInteractionList]
userInfo:[NSDictionary dictionaryWithObject:o_value forKey:@"VLCDialogPointer"]];
-
+
[o_pool release];
return VLC_SUCCESS;
}
i_lastShownVolume = -1;
o_remote = [[AppleRemote alloc] init];
- [o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
+ [o_remote setClickCountEnabledButtons: kRemoteButtonPlay];
[o_remote setDelegate: _o_sharedMainInstance];
-
+
+ o_eyetv = [[VLCEyeTVController alloc] init];
+
+ /* announce our launch to a potential eyetv plugin */
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
+ object: @"VLCEyeTVSupport"
+ userInfo: NULL
+ deliverImmediately: YES];
+
return _o_sharedMainInstance;
}
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
[o_window setDelegate: self];
-
+
+ b_restore_size = false;
if( [o_window frame].size.height <= 200 )
{
b_small_window = YES;
var_AddCallback( p_playlist, "intf-show", ShowController, self);
vlc_object_release( p_playlist );
-
+
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, self );
p_intf->b_interaction = VLC_TRUE;
selector: @selector(refreshVoutDeviceMenu:)
name: NSApplicationDidChangeScreenParametersNotification
object: nil];
-
+
nib_main_loaded = TRUE;
}
[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")];
return( o_str );
}
+/* When user click in the Dock icon our double click in the finder */
+- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows
+{
+ if (!hasVisibleWindows)
+ [o_window makeKeyAndOrderFront:self];
+
+ return YES;
+}
+
+- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
+{
+ /* Check for update silently on startup */
+ if ( !nib_update_loaded )
+ nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
+
+ if([o_update shouldCheckForUpdate])
+ [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL];
+
+ /* Handle sleep notification */
+ [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
+ name:NSWorkspaceWillSleepNotification object:nil];
+}
+
/* Listen to the remote in exclusive mode, only when VLC is the active
application */
- (void)applicationDidBecomeActive:(NSNotification *)aNotification
[o_remote stopListening: self];
}
+/* Triggered when the computer goes to sleep */
+- (void)computerWillSleep: (NSNotification *)notification
+{
+ /* Pause */
+ if ( 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 );
+ }
+}
+
/* Helper method for the remote control interface in order to trigger forward/backward and volume
increase/decrease as long as the user holds the left/right, plus/minus button */
-- (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber
+- (void) executeHoldActionForRemoteButton: (NSNumber*) buttonIdentifierNumber
{
- if (b_remote_button_hold)
+ if (b_remote_button_hold)
{
- switch([buttonIdentifierNumber intValue])
+ switch([buttonIdentifierNumber intValue])
{
- case kRemoteButtonRight_Hold:
+ case kRemoteButtonRight_Hold:
[o_controls forward: self];
break;
case kRemoteButtonLeft_Hold:
break;
case kRemoteButtonVolume_Minus_Hold:
[o_controls volumeDown: self];
- break;
+ break;
}
- if (b_remote_button_hold)
+ if (b_remote_button_hold)
{
/* trigger event */
- [self performSelector:@selector(executeHoldActionForRemoteButton:)
+ [self performSelector:@selector(executeHoldActionForRemoteButton:)
withObject:buttonIdentifierNumber
- afterDelay:0.25];
+ afterDelay:0.25];
}
}
}
/* Apple Remote callback */
-- (void) appleRemoteButton: (AppleRemoteEventIdentifier)buttonIdentifier
- pressedDown: (BOOL) pressedDown
- clickCount: (unsigned int) count
+- (void) appleRemoteButton: (AppleRemoteEventIdentifier)buttonIdentifier
+ pressedDown: (BOOL) pressedDown
+ clickCount: (unsigned int) count
{
switch( buttonIdentifier )
{
[o_controls toogleFullscreen:self];
} else {
[o_controls play: self];
- }
+ }
break;
case kRemoteButtonVolume_Plus:
[o_controls volumeUp: self];
/* simulate an event as long as the user holds the button */
b_remote_button_hold = pressedDown;
if( pressedDown )
- {
- NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
- [self performSelector:@selector(executeHoldActionForRemoteButton:)
+ {
+ NSNumber* buttonIdentifierNumber = [NSNumber numberWithInt: buttonIdentifier];
+ [self performSelector:@selector(executeHoldActionForRemoteButton:)
withObject:buttonIdentifierNumber];
}
break;
return o_vout_menu;
}
+- (id)getEyeTVController
+{
+ if( o_eyetv )
+ return o_eyetv;
+ return nil;
+}
+
- (void)manage
{
playlist_t * p_playlist;
/* input stopped */
p_intf->p_sys->b_intf_update = VLC_TRUE;
p_intf->p_sys->i_play_status = END_S;
- [self setScrollField: _NS("VLC media player") stopAfter:-1];
msg_Dbg( p_intf, "input has stopped, refreshing interface" );
p_intf->p_sys->p_input = NULL;
}
- (void)manageIntf:(NSTimer *)o_timer
{
vlc_value_t val;
+ playlist_t * p_playlist;
+ input_thread_t * p_input;
if( p_intf->p_libvlc->b_die == VLC_TRUE )
{
vlc_bool_t b_chapters = VLC_FALSE;
playlist_t * p_playlist = pl_Yield( p_intf );
- /** \todo fix i_size use */
+ /** \todo fix i_size use */
b_plmul = p_playlist->items.i_size > 1;
+ p_input = p_playlist->p_input;
- vlc_object_release( p_playlist );
-
- if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) )
+ if( ( b_input = ( p_input != NULL ) ) )
{
- vlc_object_yield( p_intf->p_sys->p_input );
/* seekable streams */
- b_seekable = var_GetBool( p_intf->p_sys->p_input, "seekable" );
+ vlc_object_yield( p_input );
+ b_seekable = var_GetBool( p_input, "seekable" );
/* check wether slow/fast motion is possible*/
- b_control = p_intf->p_sys->p_input->b_can_pace_control;
+ b_control = p_input->b_can_pace_control;
+
/* chapters & titles */
- //b_chapters = p_intf->p_sys->p_input->stream.i_area_nb > 1;
- vlc_object_release( p_intf->p_sys->p_input );
+ //b_chapters = p_input->stream.i_area_nb > 1;
+ vlc_object_release( p_input );
}
+ vlc_object_release( p_playlist );
[o_btn_stop setEnabled: b_input];
[o_btn_ff setEnabled: b_seekable];
if( p_intf->p_sys->b_fullscreen_update )
{
- playlist_t * p_playlist = pl_Yield( p_intf );
- var_Get( p_playlist, "fullscreen", &val );
- [o_embedded_window setFullscreen: val.b_bool];
- vlc_object_release( p_playlist );
-
p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
}
p_intf->p_sys->b_intf_show = VLC_FALSE;
}
- if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ p_playlist = pl_Yield( p_intf );
+ p_input = p_playlist->p_input;
+
+ if( p_input && !p_input->b_die )
{
vlc_value_t val;
+ vlc_object_yield( p_input );
if( p_intf->p_sys->b_current_title_update )
{
NSString *o_temp;
- playlist_t * p_playlist = pl_Yield( p_intf );
if( p_playlist->status.p_item == NULL )
{
+ vlc_object_release( p_input );
vlc_object_release( p_playlist );
return;
}
[[[self getControls] getFSPanel] setStreamTitle: o_temp];
[[o_controls getVoutView] updateTitle];
-
+
[o_playlist updateRowSelection];
- vlc_object_release( p_playlist );
p_intf->p_sys->b_current_title_update = FALSE;
}
- if( p_intf->p_sys->p_input && [o_timeslider isEnabled] )
+ if( [o_timeslider isEnabled] )
{
/* Update the slider */
vlc_value_t time;
vlc_value_t pos;
float f_updated;
- var_Get( p_intf->p_sys->p_input, "position", &pos );
+ var_Get( p_input, "position", &pos );
f_updated = 10000. * pos.f_float;
[o_timeslider setFloatValue: f_updated];
- var_Get( p_intf->p_sys->p_input, "time", &time );
+ var_Get( p_input, "time", &time );
i_seconds = time.i_time / 1000000;
o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
}
/* Manage Playing status */
- var_Get( p_intf->p_sys->p_input, "state", &val );
+ 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
{
[o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
[self setSubmenusEnabled: FALSE];
}
-
+ vlc_object_release( p_playlist );
[self updateMessageArray];
- if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
+ if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
[self resetScrollField];
-
[NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
userInfo: nil repeats: FALSE];
- (void)setupMenus
{
-#define p_input p_intf->p_sys->p_input
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = p_playlist->p_input;
if( p_input != NULL )
{
+ vlc_object_yield( p_input );
[o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
var: "program" selector: @selector(toggleVar:)];
}
vlc_object_release( (vlc_object_t *)p_vout );
}
+ vlc_object_release( p_input );
}
-#undef p_input
+ vlc_object_release( p_playlist );
}
- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification
int x,y = 0;
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
-
+
if(! p_vout )
return;
-
+
/* clean the menu before adding new entries */
if( [o_mi_screen hasSubmenu] )
{
[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 );
}
- (void)setScrollField:(NSString *)o_string stopAfter:(int)timeout
- (void)resetScrollField
{
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = p_playlist->p_input;
+
i_end_scroll = -1;
- if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ if( p_input && !p_input->b_die )
{
NSString *o_temp;
- playlist_t * p_playlist = pl_Yield( p_intf );
-
+ vlc_object_yield( p_input );
o_temp = [NSString stringWithUTF8String:
p_playlist->status.p_item->p_input->psz_name];
if( o_temp == NULL )
o_temp = [NSString stringWithCString:
p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
+ vlc_object_release( p_input );
vlc_object_release( p_playlist );
return;
}
+ vlc_object_release( p_playlist );
[self setScrollField: _NS("VLC media player") stopAfter:-1];
}
- (IBAction)timesliderUpdate:(id)sender
{
-#define p_input p_intf->p_sys->p_input
float f_updated;
+ playlist_t * p_playlist;
+ input_thread_t * p_input;
switch( [[NSApp currentEvent] type] )
{
default:
return;
}
-
+ p_playlist = pl_Yield( p_intf );
+ p_input = p_playlist->p_input;
if( p_input != NULL )
{
vlc_value_t time;
vlc_value_t pos;
mtime_t i_seconds;
NSString * o_time;
+ vlc_object_yield( p_input );
pos.f_float = f_updated / 10000.;
var_Set( p_input, "position", pos );
[o_timefield setStringValue: o_time];
[[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
[o_embedded_window setTime: o_time position: f_updated];
+ vlc_object_release( p_input );
}
-#undef p_input
+ vlc_object_release( p_playlist );
}
-- (void)terminate
+- (void)applicationWillTerminate:(NSNotification *)notification
{
playlist_t * p_playlist;
vout_thread_t * p_vout;
int returnedValue = 0;
-
-#define p_input p_intf->p_sys->p_input
- if( p_input )
- {
- vlc_object_release( p_input );
- p_input = NULL;
- }
-#undef p_input
-
+
/* Stop playback */
p_playlist = pl_Yield( p_intf );
playlist_Stop( p_playlist );
vlc_object_release( p_playlist );
- /* FIXME - Wait here until all vouts are terminated because
- libvlc's VLC_CleanUp destroys interfaces before vouts, which isn't
- good on OS X. We definitly need a cleaner way to handle this,
- but this may hopefully be good enough for now.
- -- titer 2003/11/22 */
- while( ( p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE ) ) )
- {
- vlc_object_release( p_vout );
- msleep( 100000 );
- }
- msleep( 500000 );
-
/* make sure that the current volume is saved */
config_PutInt( p_intf->p_libvlc, "volume", i_lastShownVolume );
returnedValue = config_SaveConfigFile( p_intf->p_libvlc, "main" );
if( returnedValue != 0 )
- msg_Err( p_intf,
+ msg_Err( p_intf,
"error while saving volume in osx's terminate method (%i)",
returnedValue );
{
[o_extended savePrefs];
}
-
+
p_intf->b_interaction = VLC_FALSE;
var_DelCallback( p_intf, "interaction", InteractCallback, self );
-
+
/* remove global observer watching for vout device changes correctly */
[[NSNotificationCenter defaultCenter] removeObserver: self
name: NSApplicationDidChangeScreenParametersNotification
* will be called later on -- FK (10/6/05) */
if( nib_about_loaded && o_about )
[o_about release];
-
+
if( nib_open_loaded && o_open )
[o_open release];
-
+
if( nib_extended_loaded && o_extended )
{
[o_extended collapsAll];
[o_extended release];
}
-
+
if( nib_bookmarks_loaded && o_bookmarks )
[o_bookmarks release];
if( nib_wizard_loaded && o_wizard )
[o_wizard release];
-
+
if( o_embedded_list != nil )
[o_embedded_list release];
if( o_interaction_list != nil )
[o_interaction_list release];
+ if( o_eyetv != nil )
+ [o_eyetv release];
+
if( o_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
- p_intf->b_die = VLC_TRUE;
+ vlc_object_kill( p_intf );
+
+ /* Go back to Run() and make libvlc exit properly */
+ longjmp( jmpbuffer, 1 );
+ /* not reached */
}
+
- (IBAction)clearRecentItems:(id)sender
{
[[NSDocumentController sharedDocumentController]
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
}
-
+
if ( !nib_bookmarks_loaded )
{
nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
- (IBAction)checkForUpdate:(id)sender
{
if ( !nib_update_loaded )
- {
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
- [o_update showUpdateWindow];
- } else {
- [o_update showUpdateWindow];
- }
+
+ [o_update showUpdateWindow];
}
- (IBAction)openReadMe:(id)sender
/*First, check if the playlist is visible*/
if( o_rect.size.height <= 200 )
{
+ o_restore_rect = o_rect;
+ 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 > 200 )
} else {
o_rect.size.height = 500;
}
-
+
if ( o_size_with_playlist.width > [o_window minSize].width )
{
o_rect.size.width = o_size_with_playlist.width;
} else {
o_rect.size.width = 500;
}
-
+
o_rect.size.height = (o_size_with_playlist.height > 200) ?
o_size_with_playlist.height : 500;
o_rect.origin.x = [o_window frame].origin.x;
o_rect.origin.y = [o_window frame].origin.y - o_rect.size.height +
[o_window minSize].height;
+
+ 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;
/* make small */
o_rect.size.height = [o_window minSize].height;
o_rect.size.width = [o_window minSize].width;
o_rect.origin.y = [o_window frame].origin.y +
[o_window frame].size.height - [o_window minSize].height;
+ if ( b_restore_size )
+ o_rect = o_restore_rect;
+
[o_playlist_view setAutoresizesSubviews: NO];
[o_playlist_view removeFromSuperview];
[o_btn_playlist setState: NO];
return proposedFrameSize;
}
+- (void)windowDidMove:(NSNotification *)notif
+{
+ b_restore_size = false;
+}
+
- (void)windowDidResize:(NSNotification *)notif
{
if( [o_window frame].size.height > 200 && b_small_window )
projects / vlc / blobdiff