* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan.org>
- * Felix K\9fhne <fkuehne at videolan dot org>
+ * Felix Paul Kühne <fkuehne at videolan dot org>
*
* This program is free software; you can redistribute it and/or modify
* 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 "update.h"
#import "AppleRemote.h"
#import "eyetv.h"
+#import "simple_prefs.h"
#import <vlc_input.h>
*****************************************************************************/
static void Run ( intf_thread_t *p_intf );
+/* Quick hack */
+/*****************************************************************************
+ * VLCApplication implementation (this hack is really disgusting now,
+ * feel free to fix.)
+ *****************************************************************************/
+@interface VLCApplication : NSApplication
+{
+ libvlc_int_t *o_libvlc;
+}
+- (void)setVLC: (libvlc_int_t *)p_libvlc;
+@end
+
+
+@implementation VLCApplication
+- (void)setVLC: (libvlc_int_t *) p_libvlc
+{
+ o_libvlc = p_libvlc;
+}
+- (void)terminate: (id)sender
+{
+ vlc_object_kill( o_libvlc );
+ [super terminate: sender];
+}
+@end
+
/*****************************************************************************
* OpenIntf: initialize interface
*****************************************************************************/
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
- /* Put Cocoa into multithread mode as soon as possible.
- * http://developer.apple.com/techpubs/macosx/Cocoa/
- * TasksAndConcepts/ProgrammingTopics/Multithreading/index.html
- * This thread does absolutely nothing at all. */
- //[NSThread detachNewThreadSelector:@selector(self) toTarget:[NSString string] withObject:nil];
-
p_intf->p_sys->o_sendport = [[NSPort port] retain];
p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
+ p_intf->b_should_run_on_first_thread = VLC_TRUE;
return( 0 );
}
sigaddset( &set, SIGTERM );
pthread_sigmask( SIG_UNBLOCK, &set, NULL );
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+
+ /* Install a jmpbuffer to where we can go back before the NSApp exit
+ * see applicationWillTerminate: */
+ /* We need that code to run on main thread */
+ [VLCApplication sharedApplication];
+ [NSApp setVLC: p_intf->p_libvlc];
+
[[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
* see applicationWillTerminate: */
if(setjmp(jmpbuffer) == 0)
[NSApp run];
+
+ [o_pool release];
}
int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
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;
}
}
o_about = [[VLAboutBox alloc] init];
- o_prefs = nil;
+ o_prefs = [[VLCPrefs alloc] init];
o_open = [[VLCOpen alloc] init];
o_wizard = [[VLCWizard alloc] init];
o_extended = nil;
o_embedded_list = [[VLCEmbeddedList alloc] init];
o_interaction_list = [[VLCInteractionList alloc] init];
o_sfilters = nil;
- o_update = [[VLCUpdate alloc] init];
+#ifdef UPDATE_CHECK
+ //FIXME o_update = [[VLCUpdate alloc] init];
+#endif
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];
[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];
+
+ o_img_play = [NSImage imageNamed: @"play"];
+ o_img_pause = [NSImage imageNamed: @"pause"];
+
+ [self controlTintChanged];
+
+ [[NSNotificationCenter defaultCenter] addObserver: self
+ selector: @selector( controlTintChanged )
+ name: NSControlTintDidChangeNotification
+ object: nil];
nib_main_loaded = TRUE;
}
+- (void)controlTintChanged
+{
+ BOOL b_playing = NO;
+
+ if( [o_btn_play alternateImage] == o_img_play_pressed )
+ b_playing = YES;
+
+ if( [NSColor currentControlTint] == NSGraphiteControlTint )
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_graphite"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_graphite"];
+
+ [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_graphite"]];
+ [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_graphite"]];
+ [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_graphite"]];
+ [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_graphite"]];
+ [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_graphite"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_graphite"]];
+ [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_graphite"]];
+ [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_graphite"]];
+ }
+ else
+ {
+ o_img_play_pressed = [NSImage imageNamed: @"play_blue"];
+ o_img_pause_pressed = [NSImage imageNamed: @"pause_blue"];
+
+ [o_btn_prev setAlternateImage: [NSImage imageNamed: @"previous_blue"]];
+ [o_btn_rewind setAlternateImage: [NSImage imageNamed: @"skip_previous_blue"]];
+ [o_btn_stop setAlternateImage: [NSImage imageNamed: @"stop_blue"]];
+ [o_btn_ff setAlternateImage: [NSImage imageNamed: @"skip_forward_blue"]];
+ [o_btn_next setAlternateImage: [NSImage imageNamed: @"next_blue"]];
+ [o_btn_fullscreen setAlternateImage: [NSImage imageNamed: @"fullscreen_blue"]];
+ [o_btn_playlist setAlternateImage: [NSImage imageNamed: @"playlistdrawer_blue"]];
+ [o_btn_equalizer setAlternateImage: [NSImage imageNamed: @"equalizerdrawer_blue"]];
+ }
+
+ if( b_playing )
+ [o_btn_play setAlternateImage: o_img_play_pressed];
+ else
+ [o_btn_play setAlternateImage: o_img_pause_pressed];
+}
+
- (void)initStrings
{
[o_window setTitle: _NS("VLC - Controller")];
/* messages panel */
[o_msgs_panel setTitle: _NS("Messages")];
- [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
+ [o_msgs_btn_crashlog setTitle: _NS("Open CrashLog...")];
/* main menu */
[o_mi_about setTitle: [_NS("About VLC media player") \
[o_mu_window setTitle: _NS("Window")];
[o_mi_minimize setTitle: _NS("Minimize Window")];
[o_mi_close_window setTitle: _NS("Close Window")];
- [o_mi_controller setTitle: _NS("Controller")];
- [o_mi_equalizer setTitle: _NS("Equalizer")];
- [o_mi_extended setTitle: _NS("Extended Controls")];
- [o_mi_bookmarks setTitle: _NS("Bookmarks")];
- [o_mi_playlist setTitle: _NS("Playlist")];
- [o_mi_info setTitle: _NS("Information")];
- [o_mi_messages setTitle: _NS("Messages")];
- [o_mi_errorsAndWarnings setTitle: _NS("Errors and Warnings")];
+ [o_mi_controller setTitle: _NS("Controller...")];
+ [o_mi_equalizer setTitle: _NS("Equalizer...")];
+ [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_readme setTitle: _NS("ReadMe...")];
- [o_mi_documentation setTitle: _NS("Online Documentation")];
- [o_mi_reportabug setTitle: _NS("Report a Bug")];
- [o_mi_website setTitle: _NS("VideoLAN Website")];
+ [o_mi_help setTitle: _NS("VLC media player Help...")];
+ [o_mi_readme setTitle: _NS("ReadMe / FAQ...")];
[o_mi_license setTitle: _NS("License")];
- [o_mi_donation setTitle: _NS("Make a donation")];
- [o_mi_forum setTitle: _NS("Online Forum")];
+ [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_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_fullscreen setTitle: _NS("Fullscreen")];
[o_vmi_snapshot setTitle: _NS("Snapshot")];
- [o_info_window setTitle: _NS("Information")];
+ [o_info_window setTitle: _NS("Media Information")];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
o_msg_lock = [[NSLock alloc] init];
o_msg_arr = [[NSMutableArray arrayWithCapacity: 200] retain];
- o_img_play = [[NSImage imageNamed: @"play"] retain];
- o_img_play_pressed = [[NSImage imageNamed: @"play_blue"] retain];
- o_img_pause = [[NSImage imageNamed: @"pause"] retain];
- o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
-
[p_intf->p_sys->o_sendport setDelegate: self];
[[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
[o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
var: "intf-add" selector: @selector(toggleVar:)];
+ /* check whether the user runs a valid version of OSX; alert is auto-released */
+ if( MACOS_VERSION < 10.4f )
+ {
+ NSAlert *ourAlert;
+ int i_returnValue;
+ ourAlert = [NSAlert alertWithMessageText: _NS("Your version of Mac OS X is not supported")
+ defaultButton: _NS("Quit")
+ alternateButton: NULL
+ otherButton: NULL
+ informativeTextWithFormat: _NS("VLC media player requires Mac OS X 10.4 or higher.")];
+ [ourAlert setAlertStyle: NSCriticalAlertStyle];
+ i_returnValue = [ourAlert runModal];
+ [NSApp terminate: self];
+ }
+
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
}
return( TRUE );
}
-- (NSString *)localizedString:(char *)psz
+- (NSString *)localizedString:(const char *)psz
{
NSString * o_str = nil;
{
o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
- if ( o_str == NULL )
+ if( o_str == NULL )
{
msg_Err( VLCIntf, "could not translate: %s", psz );
return( @"" );
/* When user click in the Dock icon our double click in the finder */
- (BOOL)applicationShouldHandleReopen:(NSApplication *)theApplication hasVisibleWindows:(BOOL)hasVisibleWindows
-{
- if (!hasVisibleWindows)
+{
+ if(!hasVisibleWindows)
[o_window makeKeyAndOrderFront:self];
return YES;
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification
{
+#ifdef UPDATE_CHECK
/* Check for update silently on startup */
- NSLog(@"checking for update");
- if ( !nib_update_loaded )
+ if( !nib_update_loaded )
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
- [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL];
+
+ // FIXME
+ //if([o_update shouldCheckForUpdate])
+ // [NSThread detachNewThreadSelector:@selector(checkForUpdate) toTarget:o_update withObject:NULL];
+#endif
+
+ /* 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
[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 )
{
case kRemoteButtonPlay:
- if (count >= 2) {
+ if(count >= 2) {
[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;
allowLossyConversion: NO];
char * psz_string;
- if ( o_data == nil )
+ if( o_data == nil )
{
o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: YES];
effectiveRange: &effectiveRange];
charRange = [o_layout_manager characterRangeForGlyphRange: effectiveRange
actualGlyphRange: &effectiveRange];
- if ([o_wrapped lineRangeForRange:
+ if([o_wrapped lineRangeForRange:
NSMakeRange(charRange.location + breaksInserted, charRange.length)].length > charRange.length) {
[o_wrapped insertString: @"\n" atIndex: NSMaxRange(charRange) + breaksInserted];
breaksInserted++;
- (id)getControls
{
- if ( o_controls )
- {
+ if( o_controls )
return o_controls;
- }
+
return nil;
}
+- (id)getSimplePreferences
+{
+ if( !o_sprefs )
+ return nil;
+
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
+
+ return o_sprefs;
+}
+
+- (id)getPreferences
+{
+ if( !o_prefs )
+ return nil;
+
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
+
+ return o_prefs;
+}
+
- (id)getPlaylist
{
if( o_playlist )
return o_playlist;
+
return nil;
}
- (id)getInfo
{
- if ( o_info )
- {
+ if( o_info )
return o_info;
- }
+
return nil;
}
- (id)getWizard
{
- if ( o_wizard )
- {
+ if( o_wizard )
return o_wizard;
- }
+
return nil;
}
- (id)getBookmarks
{
- if ( o_bookmarks )
- {
+ if( o_bookmarks )
return o_bookmarks;
- }
+
return nil;
}
- (id)getEmbeddedList
{
if( o_embedded_list )
- {
return o_embedded_list;
- }
+
return nil;
}
- (id)getInteractionList
{
if( o_interaction_list )
- {
return o_interaction_list;
- }
+
return nil;
}
if( o_main_pgbar )
return o_main_pgbar;
- msg_Err( p_intf, "main interface progress bar item wasn't found" );
return nil;
}
{
if( o_eyetv )
return o_eyetv;
+
return nil;
}
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_yield( p_input );
b_seekable = var_GetBool( p_input, "seekable" );
- /* check wether slow/fast motion is possible*/
+ /* check whether slow/fast motion is possible */
b_control = p_input->b_can_pace_control;
-
/* chapters & titles */
//b_chapters = p_input->stream.i_area_nb > 1;
[o_timeslider setFloatValue: 0.0];
[o_timeslider setEnabled: b_seekable];
- [o_timefield setStringValue: @"0:00:00"];
- [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"0:00:00"];
+ [o_timefield setStringValue: @"00:00"];
+ [[[self getControls] getFSPanel] setStreamPos: 0 andTime: @"00:00"];
[[[self getControls] getFSPanel] setSeekable: b_seekable];
[o_embedded_window setSeekable: b_seekable];
+ p_intf->p_sys->b_current_title_update = VLC_TRUE;
+
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
vlc_object_release( p_playlist );
return;
}
- o_temp = [NSString stringWithUTF8String:
- p_playlist->status.p_item->p_input->psz_name];
- if( o_temp == NULL )
- o_temp = [NSString stringWithCString:
+ if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
+ o_temp = [NSString stringWithUTF8String:
+ input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )];
+ else
+ o_temp = [NSString stringWithUTF8String:
p_playlist->status.p_item->p_input->psz_name];
[self setScrollField: o_temp stopAfter:-1];
[[[self getControls] getFSPanel] setStreamTitle: o_temp];
[[o_controls getVoutView] updateTitle];
-
+
[o_playlist updateRowSelection];
p_intf->p_sys->b_current_title_update = FALSE;
}
/* Update the slider */
vlc_value_t time;
NSString * o_time;
- mtime_t i_seconds;
vlc_value_t pos;
+ char psz_time[MSTRTIME_MAX_SIZE];
float f_updated;
var_Get( p_input, "position", &pos );
[o_timeslider setFloatValue: f_updated];
var_Get( p_input, "time", &time );
- i_seconds = time.i_time / 1000000;
- o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
- (int) (i_seconds / (60 * 60)),
- (int) (i_seconds / 60 % 60),
- (int) (i_seconds % 60)];
+ 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];
[o_embedded_window setTime: o_time position: f_updated];
aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
FIND_ANYWHERE );
- if ( p_aout != NULL )
+ if( p_aout != NULL )
{
[o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
var: "audio-channels" selector: @selector(toggleVar:)];
vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
FIND_ANYWHERE );
- if ( p_vout != NULL )
+ if( p_vout != NULL )
{
vlc_object_t * p_dec_obj;
(vlc_object_t *)p_vout,
VLC_OBJECT_DECODER,
FIND_PARENT );
- if ( p_dec_obj != NULL )
+ if( p_dec_obj != NULL )
{
[o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
(vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
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] )
{
{
NSString *o_temp;
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];
+ if( input_item_GetNowPlaying ( p_playlist->status.p_item->p_input ) )
+ o_temp = [NSString stringWithUTF8String:
+ input_item_GetNowPlaying ( p_playlist->status.p_item->p_input )];
+ else
+ o_temp = [NSString stringWithUTF8String:
+ 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 );
{
vlc_value_t time;
vlc_value_t pos;
- mtime_t i_seconds;
NSString * o_time;
+ char psz_time[MSTRTIME_MAX_SIZE];
vlc_object_yield( p_input );
pos.f_float = f_updated / 10000.;
[o_timeslider setFloatValue: f_updated];
var_Get( p_input, "time", &time );
- i_seconds = time.i_time / 1000000;
- o_time = [NSString stringWithFormat: @"%d:%02d:%02d",
- (int) (i_seconds / (60 * 60)),
- (int) (i_seconds / 60 % 60),
- (int) (i_seconds % 60)];
+ 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];
[o_embedded_window setTime: o_time position: f_updated];
playlist_t * p_playlist;
vout_thread_t * p_vout;
int returnedValue = 0;
-
+
/* Stop playback */
p_playlist = pl_Yield( p_intf );
playlist_Stop( p_playlist );
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 );
/* save the prefs if they were changed in the extended panel */
- if (o_extended && [o_extended getConfigChanged])
+ if(o_extended && [o_extended getConfigChanged])
{
[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
- object: nil];
+ [[NSNotificationCenter defaultCenter] removeObserver: self];
/* release some other objects here, because it isn't sure whether dealloc
- * will be called later on -- FK (10/6/05) */
+ * will be called later on */
+
if( nib_about_loaded && o_about )
[o_about release];
+ if( nib_prefs_loaded && o_prefs )
+ [o_prefs 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];
o_img_pause_pressed = nil;
}
- if( o_img_pause_pressed != nil )
+ if( o_img_play_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
/* 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 );
- (IBAction)intfOpenFile:(id)sender
{
- if ( !nib_open_loaded )
+ if( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenFileGeneric:(id)sender
{
- if ( !nib_open_loaded )
+ if( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenDisc:(id)sender
{
- if ( !nib_open_loaded )
+ if( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)intfOpenNet:(id)sender
{
- if ( !nib_open_loaded )
+ if( !nib_open_loaded )
{
nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
[o_open awakeFromNib];
- (IBAction)showWizard:(id)sender
{
- if ( !nib_wizard_loaded )
+ if( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
- (IBAction)showExtended:(id)sender
{
- if ( o_extended == nil )
+ if( o_extended == nil )
{
o_extended = [[VLCExtended alloc] init];
}
- if ( !nib_extended_loaded )
+ if( !nib_extended_loaded )
{
nib_extended_loaded = [NSBundle loadNibNamed:@"Extended" owner:self];
[o_extended initStrings];
- (IBAction)showSFilters:(id)sender
{
- if ( o_sfilters == nil )
+ if( o_sfilters == nil )
{
o_sfilters = [[VLCsFilters alloc] init];
}
- if ( !nib_sfilters_loaded )
+ if( !nib_sfilters_loaded )
{
nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
[o_sfilters initStrings];
- (IBAction)showBookmarks:(id)sender
{
/* we need the wizard-nib for the bookmarks's extract functionality */
- if ( !nib_wizard_loaded )
+ if( !nib_wizard_loaded )
{
nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
[o_wizard initStrings];
}
-
- if ( !nib_bookmarks_loaded )
- {
+
+ if( !nib_bookmarks_loaded )
nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
- [o_bookmarks showBookmarks];
- } else {
- [o_bookmarks showBookmarks];
- }
+
+ [o_bookmarks showBookmarks];
}
- (IBAction)viewAbout:(id)sender
{
- if ( !nib_about_loaded )
- {
+ if( !nib_about_loaded )
nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
- [o_about showPanel];
- } else {
- [o_about showPanel];
- }
+
+ [o_about showAbout];
}
+- (IBAction)showLicense:(id)sender
+{
+ if( !nib_about_loaded )
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+
+ [o_about showGPL: sender];
+}
+
- (IBAction)viewPreferences:(id)sender
{
-/* GRUIIIIIIIK */
- if( o_prefs == nil )
- o_prefs = [[VLCPrefs alloc] init];
- [o_prefs showPrefs];
+ if( !nib_prefs_loaded )
+ nib_prefs_loaded = [NSBundle loadNibNamed:@"Preferences" owner: self];
+
+ if( sender == o_mi_sprefs )
+ {
+ o_sprefs = [[VLCSimplePrefs alloc] init];
+ [o_sprefs showSimplePrefs];
+ }
+ else
+ [o_prefs showPrefs];
}
+#ifdef UPDATE_CHECK
- (IBAction)checkForUpdate:(id)sender
{
- if ( !nib_update_loaded )
+ if( !nib_update_loaded )
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
[o_update showUpdateWindow];
}
+#endif
+
+- (IBAction)viewHelp:(id)sender
+{
+ if( !nib_about_loaded )
+ {
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+ [o_about showHelp];
+ }
+ else
+ [o_about showHelp];
+}
- (IBAction)openReadMe:(id)sender
{
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
-- (IBAction)reportABug:(id)sender
-{
- NSURL * o_url = [NSURL URLWithString:
- @"http://www.videolan.org/support/bug-reporting.html"];
-
- [[NSWorkspace sharedWorkspace] openURL: o_url];
-}
-
- (IBAction)openWebsite:(id)sender
{
NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
-- (IBAction)openLicense:(id)sender
-{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"COPYING" ofType: nil];
-
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"TextEdit"];
-}
-
- (IBAction)openForum:(id)sender
{
NSURL * o_url = [NSURL URLWithString: @"http://forum.videolan.org/"];
stringByExpandingTildeInPath];
- if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
+ if( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
{
[[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"Console"];
/*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 )
+ if( o_size_with_playlist.height > 200 )
{
o_rect.size.height = o_size_with_playlist.height;
} else {
o_rect.size.height = 500;
}
-
- if ( o_size_with_playlist.width > [o_window minSize].width )
+
+ 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