/*****************************************************************************
* intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2008 the VideoLAN team
* $Id$
*
* 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
#include <string.h>
#include <vlc_keys.h>
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#import "intf.h"
#import "fspanel.h"
#import "vout.h"
#import "prefs.h"
#import "playlist.h"
+#import "playlistinfo.h"
#import "controls.h"
#import "about.h"
#import "open.h"
#import "wizard.h"
#import "extended.h"
#import "bookmarks.h"
-#import "sfilters.h"
#import "interaction.h"
#import "embeddedwindow.h"
#import "update.h"
#import "AppleRemote.h"
+#import "eyetv.h"
+#import "simple_prefs.h"
#import <vlc_input.h>
+#import <vlc_interface.h>
/*****************************************************************************
* Local prototypes.
*****************************************************************************/
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
*****************************************************************************/
-int E_(OpenIntf) ( vlc_object_t *p_this )
+int OpenIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
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->p_sys->p_sub = msg_Subscribe( p_intf );
p_intf->pf_run = Run;
+ p_intf->b_should_run_on_first_thread = true;
return( 0 );
}
/*****************************************************************************
* CloseIntf: destroy interface
*****************************************************************************/
-void E_(CloseIntf) ( vlc_object_t *p_this )
+void CloseIntf ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
+ [[VLCMain sharedInstance] setIntf: nil];
+
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
- [p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
free( p_intf->p_sys );
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 );
+
+ 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 )
+/*****************************************************************************
+ * ManageThread: An ugly thread that polls
+ *****************************************************************************/
+static void * ManageThread( void *user_data )
{
- int i_ret = 0;
-
- //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
-
- if( [target respondsToSelector: @selector(performSelectorOnMainThread:
- withObject:waitUntilDone:)] )
- {
- [target performSelectorOnMainThread: sel
- withObject: [NSValue valueWithPointer: p_arg]
- waitUntilDone: NO];
- }
- else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
- {
- NSValue * o_v1;
- NSValue * o_v2;
- NSArray * o_array;
- NSPort * o_recv_port;
- NSInvocation * o_inv;
- NSPortMessage * o_msg;
- intf_thread_t * p_intf;
- NSConditionLock * o_lock;
- NSMethodSignature * o_sig;
-
- id * val[] = { &o_lock, &o_v2 };
-
- p_intf = (intf_thread_t *)VLCIntf;
+ id self = user_data;
- o_recv_port = [[NSPort port] retain];
- o_v1 = [NSValue valueWithPointer: val];
- o_v2 = [NSValue valueWithPointer: p_arg];
+ [self manage];
- o_sig = [target methodSignatureForSelector: sel];
- o_inv = [NSInvocation invocationWithMethodSignature: o_sig];
- [o_inv setArgument: &o_v1 atIndex: 2];
- [o_inv setTarget: target];
- [o_inv setSelector: sel];
-
- o_array = [NSArray arrayWithObject:
- [NSData dataWithBytes: &o_inv length: sizeof(o_inv)]];
- o_msg = [[NSPortMessage alloc]
- initWithSendPort: p_intf->p_sys->o_sendport
- receivePort: o_recv_port components: o_array];
-
- o_lock = [[NSConditionLock alloc] initWithCondition: 0];
- [o_msg sendBeforeDate: [NSDate distantPast]];
- [o_lock lockWhenCondition: 1];
- [o_lock unlock];
- [o_lock release];
-
- [o_msg release];
- [o_recv_port release];
- }
- else
- {
- i_ret = 1;
- }
-
- //[o_pool release];
-
- return( i_ret );
+ return NULL;
}
/*****************************************************************************
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- 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_intf_update = true;
+ p_intf->p_sys->b_playlist_update = true;
+ p_intf->p_sys->b_playmode_update = true;
+ p_intf->p_sys->b_current_title_update = true;
return VLC_SUCCESS;
}
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- p_intf->p_sys->b_intf_show = VLC_TRUE;
+ p_intf->p_sys->b_intf_show = true;
return VLC_SUCCESS;
}
vlc_value_t old_val, vlc_value_t new_val, void *param )
{
intf_thread_t * p_intf = VLCIntf;
- p_intf->p_sys->b_fullscreen_update = VLC_TRUE;
+ p_intf->p_sys->b_fullscreen_update = 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;
}
- (id)init
{
- if( _o_sharedMainInstance) {
+ if( _o_sharedMainInstance)
+ {
[self dealloc];
- } else {
+ return _o_sharedMainInstance;
+ }
+ else
_o_sharedMainInstance = [super init];
- }
o_about = [[VLAboutBox alloc] init];
o_prefs = nil;
o_bookmarks = [[VLCBookmarks alloc] init];
o_embedded_list = [[VLCEmbeddedList alloc] init];
o_interaction_list = [[VLCInteractionList alloc] init];
- o_sfilters = nil;
+ o_info = [[VLCInfo alloc] init];
+#ifdef UPDATE_CHECK
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];
+
+ /* announce our launch to a potential eyetv plugin */
+ [[NSDistributedNotificationCenter defaultCenter] postNotificationName: @"VLCOSXGUIInit"
+ object: @"VLCEyeTVSupport"
+ userInfo: NULL
+ deliverImmediately: YES];
+
return _o_sharedMainInstance;
}
if( nib_main_loaded ) return;
[self initStrings];
- [o_window setExcludedFromWindowsMenu: TRUE];
- [o_msgs_panel setExcludedFromWindowsMenu: TRUE];
+
+ [o_window setExcludedFromWindowsMenu: YES];
+ [o_msgs_panel setExcludedFromWindowsMenu: YES];
[o_msgs_panel setDelegate: self];
i_key = config_GetInt( p_intf, "key-quit" );
var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
[self setSubmenusEnabled: FALSE];
+ [o_volumeslider setEnabled: YES];
[self manageVolumeSlider];
[o_window setDelegate: self];
-
- if( [o_window frame].size.height <= 200 )
+
+ b_restore_size = false;
+
+ // Set that here as IB seems to be buggy
+ [o_window setContentMinSize:NSMakeSize(338., 30.)];
+
+ if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. )
{
b_small_window = YES;
[o_window setFrame: NSMakeRect( [o_window frame].origin.x,
else
{
b_small_window = NO;
- [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - 105 )];
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )];
[o_playlist_view setNeedsDisplay:YES];
[o_playlist_view setAutoresizesSubviews: YES];
[[o_window contentView] addSubview: o_playlist_view];
}
+
[self updateTogglePlaylistState];
- o_size_with_playlist = [o_window frame].size;
+ o_size_with_playlist = [o_window contentRectForFrameRect:[o_window frame]].size;
p_playlist = pl_Yield( p_intf );
- /* Check if we need to start playing */
- if( p_intf->b_play )
- {
- playlist_Control( p_playlist, PLAYLIST_AUTOPLAY, VLC_FALSE );
- }
var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
- val.b_bool = VLC_FALSE;
+ val.b_bool = false;
var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
- var_AddCallback( p_playlist, "intf-show", ShowController, self);
+ var_AddCallback( p_intf->p_libvlc, "intf-show", ShowController, self);
- vlc_object_release( p_playlist );
-
+ pl_Release( p_intf );
+
var_Create( p_intf, "interaction", VLC_VAR_ADDRESS );
var_AddCallback( p_intf, "interaction", InteractCallback, self );
- p_intf->b_interaction = VLC_TRUE;
+ p_intf->b_interaction = true;
/* update the playmode stuff */
- p_intf->p_sys->b_playmode_update = VLC_TRUE;
+ p_intf->p_sys->b_playmode_update = true;
[[NSNotificationCenter defaultCenter] addObserver: self
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;
}
+#pragma mark Toolbar delegate
+/* Our item identifiers */
+static NSString * VLCToolbarMediaControl = @"VLCToolbarMediaControl";
+
+- (NSArray *)toolbarAllowedItemIdentifiers:(NSToolbar *)toolbar
+{
+ return [NSArray arrayWithObjects:
+// NSToolbarCustomizeToolbarItemIdentifier,
+// NSToolbarFlexibleSpaceItemIdentifier,
+// NSToolbarSpaceItemIdentifier,
+// NSToolbarSeparatorItemIdentifier,
+ VLCToolbarMediaControl,
+ nil ];
+}
+
+- (NSArray *) toolbarDefaultItemIdentifiers: (NSToolbar *) toolbar
+{
+ return [NSArray arrayWithObjects:
+ VLCToolbarMediaControl,
+ nil ];
+}
+
+- (NSToolbarItem *) toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag
+{
+ NSToolbarItem *toolbarItem = [[[NSToolbarItem alloc] initWithItemIdentifier: itemIdentifier] autorelease];
+
+
+ if( [itemIdentifier isEqual: VLCToolbarMediaControl] )
+ {
+ [toolbarItem setLabel:@"Media Controls"];
+ [toolbarItem setPaletteLabel:@"Media Controls"];
+
+ NSSize size = toolbarMediaControl.frame.size;
+ [toolbarItem setView:toolbarMediaControl];
+ [toolbarItem setMinSize:size];
+ size.width += 1000.;
+ [toolbarItem setMaxSize:size];
+
+ // Hack: For some reason we need to make sure
+ // that the those element are on top
+ // Add them again will put them frontmost
+ [toolbarMediaControl addSubview:o_scrollfield];
+ [toolbarMediaControl addSubview:o_timeslider];
+ [toolbarMediaControl addSubview:o_timefield];
+ [toolbarMediaControl addSubview:o_main_pgbar];
+
+ /* TODO: setup a menu */
+ }
+ else
+ {
+ /* itemIdentifier referred to a toolbar item that is not
+ * provided or supported by us or Cocoa
+ * Returning nil will inform the toolbar
+ * that this kind of item is not supported */
+ toolbarItem = nil;
+ }
+ return toolbarItem;
+}
+
+#pragma mark -
+
+- (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")];
+ [o_window setTitle: _NS("VLC")];
[self setScrollField:_NS("VLC media player") stopAfter:-1];
/* button controls */
/* 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_mi_open_file setTitle: _NS("Quick Open File...")];
[o_mi_open_disc setTitle: _NS("Open Disc...")];
[o_mi_open_net setTitle: _NS("Open Network...")];
+ [o_mi_open_capture setTitle: _NS("Open Capture Device...")];
[o_mi_open_recent setTitle: _NS("Open Recent")];
[o_mi_open_recent_cm setTitle: _NS("Clear Menu")];
[o_mi_open_wizard setTitle: _NS("Streaming/Exporting Wizard...")];
[o_mu_aspect_ratio setTitle: _NS("Aspect-ratio")];
[o_mi_crop setTitle: _NS("Crop")];
[o_mu_crop setTitle: _NS("Crop")];
- [o_mi_screen setTitle: _NS("Video Device")];
- [o_mu_screen setTitle: _NS("Video Device")];
+ [o_mi_screen setTitle: _NS("Fullscreen Video Device")];
+ [o_mu_screen setTitle: _NS("Fullscreen Video Device")];
[o_mi_subtitle setTitle: _NS("Subtitles Track")];
[o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[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_mute setTitle: _NS("Mute")];
[o_vmi_fullscreen setTitle: _NS("Fullscreen")];
[o_vmi_snapshot setTitle: _NS("Snapshot")];
-
- [o_info_window setTitle: _NS("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
- forMode: NSDefaultRunLoopMode];
-
- [NSTimer scheduledTimerWithTimeInterval: 0.5
- target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE];
+ /* FIXME: don't poll */
+ interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.5
+ target: self selector: @selector(manageIntf:)
+ userInfo: nil repeats: FALSE] retain];
- [NSThread detachNewThreadSelector: @selector(manage)
- toTarget: self withObject: nil];
+ /* Note: we use the pthread API to support pre-10.5 */
+ pthread_create( &manage_thread, NULL, ManageThread, self );
[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 */
+ 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];
+#endif
+
+ /* Handle sleep notification */
+ [[[NSWorkspace sharedWorkspace] notificationCenter] addObserver:self selector:@selector(computerWillSleep:)
+ name:NSWorkspaceWillSleepNotification object:nil];
+
+ [self performSelectorInBackground:@selector(lookForCrashLog) withObject:NULL];
+}
+
/* 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 )
{
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;
}
return o_vout_menu;
}
+- (id)getEyeTVController
+{
+ if( o_eyetv )
+ return o_eyetv;
+
+ return nil;
+}
+
- (void)manage
{
playlist_t * p_playlist;
+ input_thread_t * p_input = NULL;
/* new thread requires a new pool */
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
p_playlist = pl_Yield( p_intf );
+ var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-append", PlaylistChanged, self );
var_AddCallback( p_playlist, "item-deleted", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
- vlc_object_release( p_playlist );
+ pl_Release( p_intf );
- while( !intf_ShouldDie( p_intf ) )
+ vlc_object_lock( p_intf );
+ while( vlc_object_alive( p_intf ) )
{
vlc_mutex_lock( &p_intf->change_lock );
-
- if( p_intf->p_sys->p_input == NULL )
+ if( !p_input )
{
- p_intf->p_sys->p_input = p_playlist->p_input;
+ p_input = playlist_CurrentInput( p_playlist );
- /* Refresh the interface */
- if( p_intf->p_sys->p_input )
+ /* Refresh the interface */
+ if( p_input )
{
msg_Dbg( p_intf, "input has changed, refreshing interface" );
- p_intf->p_sys->b_input_update = VLC_TRUE;
+ p_intf->p_sys->b_input_update = true;
}
}
- else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
+ else if( !vlc_object_alive (p_input) || p_input->b_dead )
{
/* input stopped */
- p_intf->p_sys->b_intf_update = VLC_TRUE;
+ p_intf->p_sys->b_intf_update = 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;
+ vlc_object_release( p_input );
+ p_input = NULL;
}
/* Manage volume status */
[self manageVolumeSlider];
vlc_mutex_unlock( &p_intf->change_lock );
- msleep( 100000 );
+
+ vlc_object_timedwait( p_intf, 100000 + mdate());
}
+ vlc_object_unlock( p_intf );
[o_pool release];
+
+ if( p_input ) vlc_object_release( p_input );
+
+ var_DelCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "intf-change", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-change", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-append", PlaylistChanged, self );
+ var_DelCallback( p_playlist, "item-deleted", PlaylistChanged, self );
+
+ pthread_testcancel(); /* If we were cancelled stop here */
+
+ msg_Dbg( p_intf, "Killing the Mac OS X module" );
+
+ /* We are dead, terminate */
+ [NSApp performSelectorOnMainThread: @selector(terminate:) withObject:nil waitUntilDone:NO];
}
- (void)manageIntf:(NSTimer *)o_timer
{
vlc_value_t val;
-
- if( p_intf->p_libvlc->b_die == VLC_TRUE )
- {
- [o_timer invalidate];
- return;
- }
+ playlist_t * p_playlist;
+ input_thread_t * p_input;
if( p_intf->p_sys->b_input_update )
{
/* Called when new input is opened */
- p_intf->p_sys->b_current_title_update = VLC_TRUE;
- p_intf->p_sys->b_intf_update = VLC_TRUE;
- p_intf->p_sys->b_input_update = VLC_FALSE;
+ p_intf->p_sys->b_current_title_update = true;
+ 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 */
}
if( p_intf->p_sys->b_intf_update )
{
- vlc_bool_t b_input = VLC_FALSE;
- vlc_bool_t b_plmul = VLC_FALSE;
- vlc_bool_t b_control = VLC_FALSE;
- vlc_bool_t b_seekable = VLC_FALSE;
- vlc_bool_t b_chapters = VLC_FALSE;
+ bool b_input = false;
+ bool b_plmul = false;
+ bool b_control = false;
+ bool b_seekable = false;
+ bool b_chapters = 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;
- vlc_object_release( p_playlist );
-
- if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) )
+ p_input = playlist_CurrentInput( p_playlist );
+ bool b_buffering = NO;
+
+ 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" );
+ int state = input_GetState( p_input );
+ if ( state == INIT_S ||
+ state == OPENING_S ||
+ state == BUFFERING_S )
+ {
+ b_buffering = YES;
+ }
+
+ /* seekable streams */
+ 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;
+ /* check whether slow/fast motion is possible */
+ 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 );
+ }
+ pl_Release( p_intf );
+
+ if( b_buffering )
+ {
+ [o_main_pgbar startAnimation:self];
+ [o_main_pgbar setIndeterminate:YES];
+ [o_main_pgbar setHidden:NO];
+ }
+ else
+ {
+ [o_main_pgbar stopAnimation:self];
+ [o_main_pgbar setHidden:YES];
}
[o_btn_stop setEnabled: b_input];
[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_intf_update = VLC_FALSE;
+ p_intf->p_sys->b_current_title_update = true;
+
+ p_intf->p_sys->b_intf_update = false;
}
if( p_intf->p_sys->b_playmode_update )
{
[o_playlist playModeUpdated];
- p_intf->p_sys->b_playmode_update = VLC_FALSE;
+ p_intf->p_sys->b_playmode_update = false;
}
if( p_intf->p_sys->b_playlist_update )
{
[o_playlist playlistUpdated];
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
+ p_intf->p_sys->b_playlist_update = false;
}
if( p_intf->p_sys->b_fullscreen_update )
{
- p_intf->p_sys->b_fullscreen_update = VLC_FALSE;
+ p_intf->p_sys->b_fullscreen_update = false;
}
if( p_intf->p_sys->b_intf_show )
{
[o_window makeKeyAndOrderFront: self];
- p_intf->p_sys->b_intf_show = VLC_FALSE;
+ p_intf->p_sys->b_intf_show = false;
}
- if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ p_input = pl_CurrentInput( p_intf );
+ if( p_input && vlc_object_alive (p_input) )
{
vlc_value_t val;
if( p_intf->p_sys->b_current_title_update )
{
- NSString *o_temp;
- playlist_t * p_playlist = pl_Yield( p_intf );
+ NSString *aString;
+ input_item_t * p_item = input_GetItem( p_input );
+ char * name = input_item_GetNowPlaying( p_item );
- if( p_playlist->status.p_item == NULL )
- {
- 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:
- p_playlist->status.p_item->p_input->psz_name];
- [self setScrollField: o_temp stopAfter:-1];
- [[[self getControls] getFSPanel] setStreamTitle: o_temp];
+ if( !name )
+ name = input_item_GetName( p_item );
+
+ aString = [NSString stringWithUTF8String:name];
+
+ free(name);
+
+ [self setScrollField: aString stopAfter:-1];
+ [[[self getControls] getFSPanel] setStreamTitle: aString];
[[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;
NSString * o_time;
- mtime_t i_seconds;
vlc_value_t pos;
+ char psz_time[MSTRTIME_MAX_SIZE];
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 );
- i_seconds = time.i_time / 1000000;
+ var_Get( p_input, "time", &time );
+
+ o_time = [NSString stringWithUTF8String: secstotimestr( psz_time, (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_timefield setStringValue: o_time];
[[[self getControls] getFSPanel] setStreamPos: f_updated andTime: o_time];
[o_embedded_window setTime: o_time position: f_updated];
}
- if( p_intf->p_sys->b_volume_update )
- {
- NSString *o_text;
- int i_volume_step = 0;
- o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
- if( i_lastShownVolume != -1 )
- [self setScrollField:o_text stopAfter:1000000];
- 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];
- p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
- p_intf->p_sys->b_volume_update = FALSE;
- }
-
/* 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 if( p_input )
+ {
+ vlc_object_release( p_input );
}
else
{
p_intf->p_sys->i_play_status = END_S;
- p_intf->p_sys->b_intf_update = VLC_TRUE;
[self playStatusUpdated: p_intf->p_sys->i_play_status];
[o_embedded_window playStatusUpdated: p_intf->p_sys->i_play_status];
[self setSubmenusEnabled: FALSE];
}
+ if( p_intf->p_sys->b_volume_update )
+ {
+ NSString *o_text;
+ int i_volume_step = 0;
+ o_text = [NSString stringWithFormat: _NS("Volume: %d%%"), i_lastShownVolume * 400 / AOUT_VOLUME_MAX];
+ if( i_lastShownVolume != -1 )
+ [self setScrollField:o_text stopAfter:1000000];
+ 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];
+ p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
+ p_intf->p_sys->b_volume_update = FALSE;
+ }
+end:
[self updateMessageArray];
- if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
+ if( ((i_end_scroll != -1) && (mdate() > i_end_scroll)) || !p_input )
[self resetScrollField];
+ [interfaceTimer autorelease];
- [NSTimer scheduledTimerWithTimeInterval: 0.3
+ interfaceTimer = [[NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
- userInfo: nil repeats: FALSE];
+ userInfo: nil repeats: FALSE] retain];
}
- (void)setupMenus
{
-#define p_input p_intf->p_sys->p_input
+ playlist_t * p_playlist = pl_Yield( p_intf );
+ input_thread_t * p_input = playlist_CurrentInput( p_playlist );
if( p_input != NULL )
{
[o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
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:
}
vlc_object_release( (vlc_object_t *)p_vout );
}
+ vlc_object_release( p_input );
}
-#undef p_input
+ pl_Release( p_intf );
}
- (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 = playlist_CurrentInput( p_playlist );
+
i_end_scroll = -1;
- if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ if( p_input && vlc_object_alive (p_input) )
{
NSString *o_temp;
- playlist_t * p_playlist = pl_Yield( p_intf );
-
- 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_playlist );
+ [[[self getControls] getFSPanel] setStreamTitle: o_temp];
+ vlc_object_release( p_input );
+ pl_Release( p_intf );
return;
}
+ pl_Release( p_intf );
[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 = playlist_CurrentInput( p_playlist );
if( p_input != NULL )
{
vlc_value_t time;
vlc_value_t pos;
- mtime_t i_seconds;
NSString * o_time;
+ char psz_time[MSTRTIME_MAX_SIZE];
pos.f_float = f_updated / 10000.;
var_Set( 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];
+ vlc_object_release( p_input );
}
-#undef p_input
+ pl_Release( p_intf );
}
- (void)applicationWillTerminate:(NSNotification *)notification
playlist_t * p_playlist;
vout_thread_t * p_vout;
int returnedValue = 0;
-
- /* Stop playback */
- p_playlist = pl_Yield( p_intf );
- playlist_Stop( p_playlist );
- vlc_object_release( p_playlist );
+
+ msg_Dbg( p_intf, "Terminating" );
+
+ /* Make sure the manage_thread won't call -terminate: again */
+ pthread_cancel( manage_thread );
+
+ /* Make sure the intf object is getting killed */
+ vlc_object_kill( p_intf );
+
+ /* Make sure our manage_thread ends */
+ pthread_join( manage_thread, NULL );
+
+ /* Make sure the interfaceTimer is destroyed */
+ [interfaceTimer invalidate];
+ [interfaceTimer release];
+ interfaceTimer = nil;
/* 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 );
/* 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;
+
+ p_intf->b_interaction = false;
var_DelCallback( p_intf, "interaction", InteractCallback, self );
-#define p_input p_intf->p_sys->p_input
- if( p_input )
- {
- vlc_object_release( p_input );
- p_input = NULL;
- }
-#undef p_input
-
/* 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) */
- if( nib_about_loaded && o_about )
+ * will be called later on */
+
+ if( nib_about_loaded )
[o_about release];
-
- if( nib_open_loaded && o_open )
- [o_open release];
-
- if( nib_extended_loaded && o_extended )
+
+ if( nib_prefs_loaded )
{
- [o_extended collapsAll];
- [o_extended release];
+ [o_sprefs release];
+ [o_prefs 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( nib_open_loaded )
+ [o_open release];
- if( o_img_pause_pressed != nil )
+ if( nib_extended_loaded )
{
- [o_img_pause_pressed release];
- o_img_pause_pressed = nil;
+ [o_extended release];
}
- if( o_img_pause_pressed != nil )
- {
- [o_img_pause_pressed release];
- o_img_pause_pressed = nil;
- }
+ if( nib_bookmarks_loaded )
+ [o_bookmarks release];
- if( o_img_pause != nil )
+ if( o_info )
{
- [o_img_pause release];
- o_img_pause = nil;
+ [o_info stopTimers];
+ [o_info release];
}
- if( o_img_play != nil )
- {
- [o_img_play release];
- o_img_play = nil;
- }
+ if( nib_wizard_loaded )
+ [o_wizard release];
+
+ [o_embedded_list release];
+ [o_interaction_list release];
+ [o_eyetv release];
- if( o_msg_arr != nil )
- {
- [o_msg_arr removeAllObjects];
- [o_msg_arr release];
- o_msg_arr = nil;
- }
+ [o_img_pause_pressed release];
+ [o_img_play_pressed release];
+ [o_img_pause release];
+ [o_img_play release];
- if( o_msg_lock != nil )
- {
- [o_msg_lock release];
- o_msg_lock = nil;
- }
+ [o_msg_arr removeAllObjects];
+ [o_msg_arr release];
+
+ [o_msg_lock release];
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
- p_intf->b_die = VLC_TRUE;
+ /* Kill the playlist, so that it doesn't accept new request
+ * such as the play request from vlc.c (we are a blocking interface). */
+ p_playlist = pl_Yield( p_intf );
+ vlc_object_kill( p_playlist );
+ pl_Release( p_intf );
+
+ vlc_object_kill( p_intf->p_libvlc );
/* Go back to Run() and make libvlc exit properly */
- longjmp( jmpbuffer, 1 );
+ if( jmpbuffer )
+ longjmp( jmpbuffer, 1 );
/* not reached */
}
- (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)intfOpenCapture:(id)sender
+{
+ if( !nib_open_loaded )
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openCapture];
+ } else {
+ [o_open openCapture];
+ }
+}
+
- (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];
- [o_extended showPanel];
- } else {
- [o_extended showPanel];
- }
-}
-- (IBAction)showSFilters:(id)sender
-{
- if ( o_sfilters == nil )
- {
- o_sfilters = [[VLCsFilters alloc] init];
- }
- if ( !nib_sfilters_loaded )
- {
- nib_sfilters_loaded = [NSBundle loadNibNamed:@"SFilters" owner:self];
- [o_sfilters initStrings];
- [o_sfilters showAsPanel];
- } else {
- [o_sfilters showAsPanel];
- }
+ [o_extended showPanel];
}
- (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];
+ o_sprefs = [[VLCSimplePrefs alloc] init];
+ o_prefs= [[VLCPrefs alloc] init];
+ }
+
+ [o_sprefs showSimplePrefs];
}
- (IBAction)checkForUpdate:(id)sender
{
- if ( !nib_update_loaded )
- {
+#ifdef UPDATE_CHECK
+ if( !nib_update_loaded )
nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
- [o_update showUpdateWindow];
- } else {
- [o_update showUpdateWindow];
+ [o_update showUpdateWindow];
+#else
+ msg_Err( VLCIntf, "Update checker wasn't enabled in this build" );
+ intf_UserFatal( VLCIntf, false, _("Update check failed"), _("Checking for updates was not enabled in this build.") );
+#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/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
}
-- (IBAction)openCrashLog:(id)sender
+#pragma mark Crash Log
+- (void)mailCrashLog:(NSString *)crashLog withUserComment:(NSString *)userComment
+{
+ static char mail[] =
+ "From: vlcuser <vlcuser@videolan.org>\n"
+ "To: VideoLAN Crash Report <apple-bugreport@videolan.org>\n"
+ "Subject: %@\n"
+ "Content-Type: text/plain; charset=ISO-8859-1; format=flowed\n"
+ "Content-Transfer-Encoding: 7bit\n"
+ "\n"
+ "%@\n\n"
+ "User Comment:\n%@\n--------------\n"
+ "\n"
+ "Crash log:\n%@\n--------------\n"
+ "\n"
+ "\n";
+ NSString * mailPath = [NSTemporaryDirectory() stringByAppendingPathComponent:@"vlc_crash_mail.eml"];
+ NSString * mailContent = [NSString stringWithFormat:[NSString stringWithUTF8String:mail],
+ _NS("Crash Report (Type Command-shift-D and hit send)"),
+ _NS("Type Command-shift-D (or in Menu \"Message\">\"Send Again\") and hit the \"Send Mail\" button."),
+ userComment, crashLog];
+ BOOL ret = [mailContent writeToFile:mailPath atomically:YES encoding:NSUTF8StringEncoding error:nil];
+ if( !ret )
+ {
+ NSRunAlertPanel(_NS("Error when generating crash report mail."), _NS("Can't prepare crash log mail"), _NS("OK"), nil, nil, nil );
+ return;
+ }
+
+ [[NSWorkspace sharedWorkspace] openFile:mailPath];
+}
+
+
+- (NSString *)latestCrashLogPathPreviouslySeen:(BOOL)previouslySeen
{
- NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
- stringByExpandingTildeInPath];
+ NSString * crashReporter = [@"~/Library/Logs/CrashReporter" stringByExpandingTildeInPath];
+ NSDirectoryEnumerator *direnum = [[NSFileManager defaultManager] enumeratorAtPath:crashReporter];
+ NSString *fname;
+ NSString * latestLog = nil;
+ NSInteger year = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"] : 0;
+ NSInteger month = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportMonth"]: 0;
+ NSInteger day = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportDay"] : 0;
+ NSInteger hours = !previouslySeen ? [[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportHours"]: 0;
+ while (fname = [direnum nextObject])
+ {
+ [direnum skipDescendents];
+ if([fname hasPrefix:@"VLC"] && [fname hasSuffix:@"crash"])
+ {
+ NSArray * compo = [fname componentsSeparatedByString:@"_"];
+ if( [compo count] < 3 ) continue;
+ compo = [[compo objectAtIndex:1] componentsSeparatedByString:@"-"];
+ if( [compo count] < 4 ) continue;
+
+ // Dooh. ugly.
+ if( year < [[compo objectAtIndex:0] intValue] ||
+ (year ==[[compo objectAtIndex:0] intValue] &&
+ (month < [[compo objectAtIndex:1] intValue] ||
+ (month ==[[compo objectAtIndex:1] intValue] &&
+ (day < [[compo objectAtIndex:2] intValue] ||
+ (day ==[[compo objectAtIndex:2] intValue] &&
+ hours < [[compo objectAtIndex:3] intValue] ))))))
+ {
+ year = [[compo objectAtIndex:0] intValue];
+ month = [[compo objectAtIndex:1] intValue];
+ day = [[compo objectAtIndex:2] intValue];
+ hours = [[compo objectAtIndex:3] intValue];
+ latestLog = [crashReporter stringByAppendingPathComponent:fname];
+ }
+ }
+ }
+
+ if(!(latestLog && [[NSFileManager defaultManager] fileExistsAtPath:latestLog]))
+ return nil;
- if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
+ if( !previouslySeen )
{
- [[NSWorkspace sharedWorkspace] openFile: o_path
- withApplication: @"Console"];
+ [[NSUserDefaults standardUserDefaults] setInteger:year forKey:@"LatestCrashReportYear"];
+ [[NSUserDefaults standardUserDefaults] setInteger:month forKey:@"LatestCrashReportMonth"];
+ [[NSUserDefaults standardUserDefaults] setInteger:day forKey:@"LatestCrashReportDay"];
+ [[NSUserDefaults standardUserDefaults] setInteger:hours forKey:@"LatestCrashReportHours"];
}
- else
+ return latestLog;
+}
+
+- (NSString *)latestCrashLogPath
+{
+ return [self latestCrashLogPathPreviouslySeen:YES];
+}
+
+- (void)lookForCrashLog
+{
+ NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
+
+ // This pref key doesn't exists? this VLC is an upgrade, and this crash log come from previous version
+ BOOL areCrashLogsTooOld = ![[NSUserDefaults standardUserDefaults] integerForKey:@"LatestCrashReportYear"];
+ NSString * latestLog = [self latestCrashLogPathPreviouslySeen:NO];
+ if( latestLog && !areCrashLogsTooOld )
+ [self performSelectorOnMainThread:@selector(notifyCrashLogToUser:) withObject:latestLog waitUntilDone:NO];
+
+ [pool release];
+}
+
+- (void)notifyCrashLogToUser:(NSString *)crashLogPath
+{
+ int ret = NSRunInformationalAlertPanel(_NS("VLC has previously crashed"),
+ _NS("VLC has previously crashed, do you want to send an email with the crash to VLC's team?"),
+ _NS("Send"), _NS("Don't Send"), nil, nil);
+ if( ret == NSAlertDefaultReturn )
{
- NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
+ [self mailCrashLog:[NSString stringWithContentsOfFile:crashLogPath] withUserComment:_NS("<Explain here what you were doing when VLC crashed, with possibly a link to the failing video>")];
+ }
+}
+- (IBAction)openCrashLog:(id)sender
+{
+ NSString * latestLog = [self latestCrashLogPath];
+ if( latestLog )
+ {
+ [[NSWorkspace sharedWorkspace] openFile: latestLog withApplication: @"Console"];
+ }
+ else
+ {
+ NSBeginInformationalAlertSheet(_NS("No CrashLog found"), _NS("Continue"), nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Couldn't find any trace of a previous crash.") );
}
}
+#pragma mark -
+
- (IBAction)viewErrorsAndWarnings:(id)sender
{
[[[self getInteractionList] getErrorPanel] showPanel];
[o_msgs_panel makeKeyAndOrderFront: sender];
}
+- (IBAction)showInformationPanel:(id)sender
+{
+ if(! nib_info_loaded )
+ nib_info_loaded = [NSBundle loadNibNamed:@"MediaInfo" owner: self];
+
+ [o_info initPanel];
+}
+
- (void)windowDidBecomeKey:(NSNotification *)o_notification
{
if( [o_notification object] == o_msgs_panel )
}
}
+#pragma mark Playlist toggling
+
- (IBAction)togglePlaylist:(id)sender
{
- NSRect o_rect = [o_window frame];
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ NSRect o_rect = [o_window contentRectForFrameRect:[o_window frame]];
/*First, check if the playlist is visible*/
- if( o_rect.size.height <= 200 )
+ if( contentRect.size.height <= 169. )
{
+ o_restore_rect = contentRect;
+ 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 > 169. )
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 )
- {
+ else
+ o_rect.size.height = 500.;
+
+ if( o_size_with_playlist.width >= [o_window contentMinSize].width )
o_rect.size.width = o_size_with_playlist.width;
- } else {
- o_rect.size.width = 500;
+ else
+ o_rect.size.width = [o_window contentMinSize].width;
+
+ o_rect.origin.x = contentRect.origin.x;
+ o_rect.origin.y = contentRect.origin.y - o_rect.size.height +
+ [o_window contentMinSize].height;
+
+ o_rect = [o_window frameRectForContentRect:o_rect];
+
+ 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_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;
+
[o_btn_playlist setState: YES];
}
else
{
- /* make small */
- o_rect.size.height = [o_window minSize].height;
- o_rect.size.width = [o_window minSize].width;
- o_rect.origin.x = [o_window frame].origin.x;
- /* Calculate the position of the lower right corner after resize */
- o_rect.origin.y = [o_window frame].origin.y +
- [o_window frame].size.height - [o_window minSize].height;
+ NSSize curSize = o_rect.size;
+ if( b_restore_size )
+ {
+ o_rect = o_restore_rect;
+ if( o_rect.size.height < [o_window contentMinSize].height )
+ o_rect.size.height = [o_window contentMinSize].height;
+ if( o_rect.size.width < [o_window contentMinSize].width )
+ o_rect.size.width = [o_window contentMinSize].width;
+ }
+ else
+ {
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ /* make small */
+ o_rect.size.height = [o_window contentMinSize].height;
+ o_rect.size.width = [o_window contentMinSize].width;
+ o_rect.origin.x = contentRect.origin.x;
+ /* Calculate the position of the lower right corner after resize */
+ o_rect.origin.y = contentRect.origin.y +
+ contentRect.size.height - [o_window contentMinSize].height;
+ }
[o_playlist_view setAutoresizesSubviews: NO];
[o_playlist_view removeFromSuperview];
[o_btn_playlist setState: NO];
b_small_window = NO; /* we aren't small here just yet. we are doing an animated resize after this */
+ o_rect = [o_window frameRectForContentRect:o_rect];
}
[o_window setFrame: o_rect display:YES animate: YES];
- (void)updateTogglePlaylistState
{
- if( [o_window frame].size.height <= 200 )
+ if( [o_window contentRectForFrameRect:[o_window frame]].size.height <= 169. )
{
[o_btn_playlist setState: NO];
}
- (NSSize)windowWillResize:(NSWindow *)sender toSize:(NSSize)proposedFrameSize
{
+
/* Not triggered on a window resize or maxification of the window. only by window mouse dragging resize */
/*Stores the size the controller one resize, to be able to restore it when
toggling the playlist*/
o_size_with_playlist = proposedFrameSize;
- if( proposedFrameSize.height <= 200 )
+ NSRect rect;
+ rect.size = proposedFrameSize;
+ if( [o_window contentRectForFrameRect:rect].size.height <= 169. )
{
if( b_small_window == 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 )
{
/* If large and coming from small then show */
[o_playlist_view setAutoresizesSubviews: YES];
- [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - [o_window minSize].height - 10 )];
+ NSRect contentRect = [o_window contentRectForFrameRect:[o_window frame]];
+ [o_playlist_view setFrame: NSMakeRect( 0, 0, contentRect.size.width, contentRect.size.height - [o_window contentMinSize].height )];
[o_playlist_view setNeedsDisplay:YES];
[[o_window contentView] addSubview: o_playlist_view];
b_small_window = NO;
[self updateTogglePlaylistState];
}
+#pragma mark -
+
@end
@implementation VLCMain (NSMenuValidation)
projects / vlc / blobdiff