/*****************************************************************************
* intf.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2004 VideoLAN
+ * Copyright (C) 2002-2006 the VideoLAN team
* $Id$
*
* Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
/*****************************************************************************
#include "prefs.h"
#include "playlist.h"
#include "controls.h"
+#include "about.h"
+#include "open.h"
+#include "wizard.h"
+#include "extended.h"
+#include "bookmarks.h"
+#include "sfilters.h"
+#include "interaction.h"
+#include "embeddedwindow.h"
+#include "update.h"
+#include "AppleRemote.h"
/*****************************************************************************
* Local prototypes.
* OpenIntf: initialize interface
*****************************************************************************/
int E_(OpenIntf) ( vlc_object_t *p_this )
-{
+{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
p_intf->p_sys = malloc( sizeof( intf_sys_t ) );
}
memset( p_intf->p_sys, 0, sizeof( *p_intf->p_sys ) );
-
+
p_intf->p_sys->o_pool = [[NSAutoreleasePool alloc] init];
/* Put Cocoa into multithread mode as soon as possible.
* 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 );
+ p_intf->p_sys->p_sub = msg_Subscribe( p_intf, MSG_QUEUE_NORMAL );
p_intf->b_play = VLC_TRUE;
p_intf->pf_run = Run;
-
- [[VLCMain sharedInstance] setIntf: p_intf];
return( 0 );
}
void E_(CloseIntf) ( vlc_object_t *p_this )
{
intf_thread_t *p_intf = (intf_thread_t*) p_this;
-
+
msg_Unsubscribe( p_intf, p_intf->p_sys->p_sub );
-
+
[p_intf->p_sys->o_sendport release];
[p_intf->p_sys->o_pool release];
* fails to go to real-time priority with the first launched thread
* (???) --Meuuh */
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ [[VLCMain sharedInstance] setIntf: p_intf];
[NSBundle loadNibNamed: @"MainMenu" owner: NSApp];
+ [NSApp run];
+ [[VLCMain sharedInstance] terminate];
}
int ExecuteOnMainThread( id target, SEL sel, void * p_arg )
{
int i_ret = 0;
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ //NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
if( [target respondsToSelector: @selector(performSelectorOnMainThread:
withObject:waitUntilDone:)] )
{
[target performSelectorOnMainThread: sel
withObject: [NSValue valueWithPointer: p_arg]
- waitUntilDone: YES];
+ waitUntilDone: NO];
}
- else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
+ else if( NSApp != nil && [[VLCMain sharedInstance] respondsToSelector: @selector(getIntf)] )
{
NSValue * o_v1;
NSValue * o_v2;
p_intf = (intf_thread_t *)VLCIntf;
o_recv_port = [[NSPort port] retain];
- o_v1 = [NSValue valueWithPointer: val];
+ o_v1 = [NSValue valueWithPointer: val];
o_v2 = [NSValue valueWithPointer: p_arg];
o_sig = [target methodSignatureForSelector: sel];
[o_msg release];
[o_recv_port release];
- }
+ }
else
{
i_ret = 1;
}
- [o_pool release];
+ //[o_pool release];
return( i_ret );
}
* playlistChanged: Callback triggered by the intf-change playlist
* variable, to let the intf update the playlist.
*****************************************************************************/
-int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
+static int PlaylistChanged( vlc_object_t *p_this, const char *psz_variable,
+ 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;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * ShowController: Callback triggered by the show-intf playlist variable
+ * through the ShowIntf-control-intf, to let us show the controller-win;
+ * usually when in fullscreen-mode
+ *****************************************************************************/
+static int ShowController( vlc_object_t *p_this, const char *psz_variable,
+ 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;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * FullscreenChanged: Callback triggered by the fullscreen-change playlist
+ * variable, to let the intf update the controller.
+ *****************************************************************************/
+static int FullscreenChanged( vlc_object_t *p_this, const char *psz_variable,
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 = TRUE;
- p_intf->p_sys->b_intf_update = TRUE;
+ p_intf->p_sys->b_fullscreen_update = VLC_TRUE;
+ return VLC_SUCCESS;
+}
+
+/*****************************************************************************
+ * InteractCallback: Callback triggered by the interaction
+ * variable, to let the intf display error and interaction dialogs
+ *****************************************************************************/
+static int InteractCallback( vlc_object_t *p_this, const char *psz_variable,
+ vlc_value_t old_val, vlc_value_t new_val, void *param )
+{
+ NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
+ 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;
}
{
unichar i_nskey;
unsigned int i_vlckey;
-} nskeys_to_vlckeys[] =
+} nskeys_to_vlckeys[] =
{
{ NSUpArrowFunctionKey, KEY_UP },
{ NSDownArrowFunctionKey, KEY_DOWN },
unichar VLCKeyToCocoa( unsigned int i_key )
{
unsigned int i;
-
+
for( i = 0; nskeys_to_vlckeys[i].i_vlckey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_vlckey == (i_key & ~KEY_MODIFIER) )
unsigned int CocoaKeyToVLC( unichar i_key )
{
unsigned int i;
-
+
for( i = 0; nskeys_to_vlckeys[i].i_nskey != 0; i++ )
{
if( nskeys_to_vlckeys[i].i_nskey == i_key )
}
/*****************************************************************************
- * VLCMain implementation
+ * VLCMain implementation
*****************************************************************************/
@implementation VLCMain
return _o_sharedMainInstance ? _o_sharedMainInstance : [[self alloc] init];
}
-- (id)init
+- (id)init
{
- if (_o_sharedMainInstance) {
+ if( _o_sharedMainInstance) {
[self dealloc];
} else {
_o_sharedMainInstance = [super init];
}
+
+ o_about = [[VLAboutBox alloc] init];
+ o_prefs = nil;
+ o_open = [[VLCOpen alloc] init];
+ o_wizard = [[VLCWizard alloc] init];
+ o_extended = nil;
+ o_bookmarks = [[VLCBookmarks alloc] init];
+ o_embedded_list = [[VLCEmbeddedList alloc] init];
+ o_interaction_list = [[VLCInteractionList alloc] init];
+ o_sfilters = nil;
+ o_update = [[VLCUpdate alloc] init];
+
+ i_lastShownVolume = -1;
+
+ o_remote = [[AppleRemote alloc] init];
+ [o_remote setDelegate: _o_sharedMainInstance];
return _o_sharedMainInstance;
}
- (void)awakeFromNib
{
unsigned int i_key = 0;
- intf_thread_t * p_intf = VLCIntf;
playlist_t *p_playlist;
vlc_value_t val;
+ /* Check if we already did this once. Opening the other nibs calls it too, because VLCMain is the owner */
+ if( nib_main_loaded ) return;
+
[self initStrings];
[o_window setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setExcludedFromWindowsMenu: TRUE];
[o_msgs_panel setDelegate: self];
-
+
i_key = config_GetInt( p_intf, "key-quit" );
[o_mi_quit setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_quit setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-next" );
[o_mi_next setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_next setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+10sec" );
+ i_key = config_GetInt( p_intf, "key-jump+short" );
[o_mi_fwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-10sec" );
+ i_key = config_GetInt( p_intf, "key-jump-short" );
[o_mi_bwd setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+1min" );
+ i_key = config_GetInt( p_intf, "key-jump+medium" );
[o_mi_fwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-1min" );
+ i_key = config_GetInt( p_intf, "key-jump-medium" );
[o_mi_bwd1m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd1m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump+5min" );
+ i_key = config_GetInt( p_intf, "key-jump+long" );
[o_mi_fwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
- i_key = config_GetInt( p_intf, "key-jump-5min" );
+ i_key = config_GetInt( p_intf, "key-jump-long" );
[o_mi_bwd5m setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_bwd5m setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
i_key = config_GetInt( p_intf, "key-vol-up" );
i_key = config_GetInt( p_intf, "key-fullscreen" );
[o_mi_fullscreen setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
[o_mi_fullscreen setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
+ i_key = config_GetInt( p_intf, "key-snapshot" );
+ [o_mi_snapshot setKeyEquivalent: [NSString stringWithFormat:@"%C", VLCKeyToCocoa( i_key )]];
+ [o_mi_snapshot setKeyEquivalentModifierMask: VLCModifiersToCocoa(i_key)];
var_Create( p_intf, "intf-change", VLC_VAR_BOOL );
[self setSubmenusEnabled: FALSE];
[self manageVolumeSlider];
+ [o_window setDelegate: self];
+ if( [o_window frame].size.height <= 200 )
+ {
+ b_small_window = YES;
+ [o_window setFrame: NSMakeRect( [o_window frame].origin.x,
+ [o_window frame].origin.y, [o_window frame].size.width,
+ [o_window minSize].height ) display: YES animate:YES];
+ [o_playlist_view setAutoresizesSubviews: NO];
+ }
+ else
+ {
+ b_small_window = NO;
+ [o_playlist_view setFrame: NSMakeRect( 10, 10, [o_window frame].size.width - 20, [o_window frame].size.height - 105 )];
+ [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;
+
p_playlist = (playlist_t *) vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST, FIND_ANYWHERE );
if( p_playlist )
/* Check if we need to start playing */
if( p_intf->b_play )
{
- playlist_Play( p_playlist );
+ playlist_LockControl( p_playlist, PLAYLIST_AUTOPLAY );
}
- [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool )];
+ var_Create( p_playlist, "fullscreen", VLC_VAR_BOOL | VLC_VAR_DOINHERIT);
+ val.b_bool = VLC_FALSE;
+
+ var_AddCallback( p_playlist, "fullscreen", FullscreenChanged, self);
+ var_AddCallback( p_playlist, "intf-show", ShowController, self);
+
+ [o_embedded_window setFullscreen: var_GetBool( p_playlist,
+ "fullscreen" )];
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;
+
+ nib_main_loaded = TRUE;
}
- (void)initStrings
{
[o_window setTitle: _NS("VLC - Controller")];
- [o_scrollfield setStringValue: _NS("VLC media player")];
+ [self setScrollField:_NS("VLC media player") stopAfter:-1];
/* button controls */
[o_btn_prev setToolTip: _NS("Previous")];
[o_btn_fullscreen setToolTip: _NS("Fullscreen")];
[o_volumeslider setToolTip: _NS("Volume")];
[o_timeslider setToolTip: _NS("Position")];
+ [o_btn_playlist setToolTip: _NS("Playlist")];
- /* messages panel */
+ /* messages panel */
[o_msgs_panel setTitle: _NS("Messages")];
[o_msgs_btn_crashlog setTitle: _NS("Open CrashLog")];
/* main menu */
- [o_mi_about setTitle: _NS("About VLC media player")];
+ [o_mi_about setTitle: [_NS("About VLC media player") \
+ stringByAppendingString: @"..."]];
+ [o_mi_checkForUpdate setTitle: _NS("Check for Update...")];
[o_mi_prefs setTitle: _NS("Preferences...")];
[o_mi_add_intf setTitle: _NS("Add Interface")];
[o_mu_add_intf setTitle: _NS("Add Interface")];
[o_mi_open_net setTitle: _NS("Open Network...")];
[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_edit setTitle: _NS("Edit")];
[o_mi_cut setTitle: _NS("Cut")];
[o_mi_clear setTitle: _NS("Clear")];
[o_mi_select_all setTitle: _NS("Select All")];
- [o_mu_controls setTitle: _NS("Controls")];
+ [o_mu_controls setTitle: _NS("Playback")];
[o_mi_play setTitle: _NS("Play")];
[o_mi_stop setTitle: _NS("Stop")];
[o_mi_faster setTitle: _NS("Faster")];
[o_mu_title setTitle: _NS("Title")];
[o_mi_chapter setTitle: _NS("Chapter")];
[o_mu_chapter setTitle: _NS("Chapter")];
-
+
[o_mu_audio setTitle: _NS("Audio")];
[o_mi_vol_up setTitle: _NS("Volume Up")];
[o_mi_vol_down setTitle: _NS("Volume Down")];
[o_mu_device setTitle: _NS("Audio Device")];
[o_mi_visual setTitle: _NS("Visualizations")];
[o_mu_visual setTitle: _NS("Visualizations")];
-
+
[o_mu_video setTitle: _NS("Video")];
[o_mi_half_window setTitle: _NS("Half Size")];
[o_mi_normal_window setTitle: _NS("Normal Size")];
[o_mi_fittoscreen setTitle: _NS("Fit to Screen")];
[o_mi_fullscreen setTitle: _NS("Fullscreen")];
[o_mi_floatontop setTitle: _NS("Float on Top")];
+ [o_mi_snapshot setTitle: _NS("Snapshot")];
[o_mi_videotrack setTitle: _NS("Video Track")];
[o_mu_videotrack setTitle: _NS("Video Track")];
+ [o_mi_aspect_ratio setTitle: _NS("Aspect-ratio")];
+ [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_subtitle setTitle: _NS("Subtitles Track")];
[o_mu_subtitle setTitle: _NS("Subtitles Track")];
[o_mi_deinterlace setTitle: _NS("Deinterlace")];
[o_mu_deinterlace setTitle: _NS("Deinterlace")];
+ [o_mi_ffmpeg_pp setTitle: _NS("Post processing")];
+ [o_mu_ffmpeg_pp setTitle: _NS("Post processing")];
[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("Info")];
+ [o_mi_info setTitle: _NS("Information")];
[o_mi_messages setTitle: _NS("Messages")];
[o_mi_bring_atf setTitle: _NS("Bring All to Front")];
[o_mi_reportabug setTitle: _NS("Report a Bug")];
[o_mi_website setTitle: _NS("VideoLAN Website")];
[o_mi_license setTitle: _NS("License")];
+ [o_mi_donation setTitle: _NS("Make a donation")];
+ [o_mi_forum setTitle: _NS("Online Forum")];
/* dock menu */
[o_dmi_play setTitle: _NS("Play")];
/* error panel */
[o_error setTitle: _NS("Error")];
- [o_err_lbl setStringValue: _NS("An error has occurred which probably prevented the execution of your request:")];
- [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, please follow the instructions at:")];
+ [o_err_lbl setStringValue: _NS("An error has occurred which probably " \
+ "prevented the proper execution of the program:")];
+ [o_err_bug_lbl setStringValue: _NS("If you believe that it is a bug, " \
+ "please follow the instructions at:")];
[o_err_btn_msgs setTitle: _NS("Open Messages Window")];
[o_err_btn_dismiss setTitle: _NS("Dismiss")];
- [o_err_ckbk_surpress setTitle: _NS("Suppress further errors")];
+ [o_err_ckbk_surpress setTitle: _NS("Do not display further errors")];
- [o_info_window setTitle: _NS("Info")];
+ [o_info_window setTitle: _NS("Information")];
}
- (void)applicationWillFinishLaunching:(NSNotification *)o_notification
o_img_pause_pressed = [[NSImage imageNamed: @"pause_blue"] retain];
[p_intf->p_sys->o_sendport setDelegate: self];
- [[NSRunLoop currentRunLoop]
+ [[NSRunLoop currentRunLoop]
addPort: p_intf->p_sys->o_sendport
forMode: NSDefaultRunLoopMode];
[NSThread detachNewThreadSelector: @selector(manage)
toTarget: self withObject: nil];
-
+
[o_controls setupVarMenuItem: o_mi_add_intf target: (vlc_object_t *)p_intf
var: "intf-add" selector: @selector(toggleVar:)];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
}
-/*
+
- (BOOL)application:(NSApplication *)o_app openFile:(NSString *)o_filename
{
NSDictionary *o_dic = [NSDictionary dictionaryWithObjectsAndKeys: o_filename, @"ITEM_URL", nil];
[o_playlist appendArray:
[NSArray arrayWithObject: o_dic] atPos: -1 enqueue: NO];
-
+
return( TRUE );
}
-*/
+
- (NSString *)localizedString:(char *)psz
{
NSString * o_str = nil;
if( psz != NULL )
{
o_str = [[[NSString alloc] initWithUTF8String: psz] autorelease];
+
+ if ( o_str == NULL )
+ {
+ msg_Err( VLCIntf, "could not translate: %s", psz );
+ return( @"" );
+ }
}
- if ( o_str == NULL )
+ else
{
- msg_Err( VLCIntf, "could not translate: %s", psz );
+ msg_Warn( VLCIntf, "can't translate empty strings" );
+ return( @"" );
}
return( o_str );
}
+/* Listen to the remote in exclusive mode, only when VLC is the active
+ application */
+- (void)applicationDidBecomeActive:(NSNotification *)aNotification
+{
+ [o_remote startListening: self];
+}
+- (void)applicationDidResignActive:(NSNotification *)aNotification
+{
+ [o_remote stopListening: self];
+}
+
+/* Apple Remote callback */
+- (void)appleRemoteButton:(AppleRemoteEventIdentifier)buttonIdentifier
+ pressedDown:(BOOL)pressedDown
+{
+ switch( buttonIdentifier )
+ {
+ case kRemoteButtonPlay:
+ [o_controls play: self];
+ break;
+
+ default:
+ /* Add here whatever you want other buttons to do */
+ break;
+ }
+}
+
- (char *)delocalizeString:(NSString *)id
{
NSData * o_data = [id dataUsingEncoding: NSUTF8StringEncoding
{
o_data = [id dataUsingEncoding: NSUTF8StringEncoding
allowLossyConversion: YES];
- psz_string = malloc( [o_data length] + 1 );
+ psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
- msg_Err( VLCIntf, "cannot convert to wanted encoding: %s",
+ msg_Err( VLCIntf, "cannot convert to the requested encoding: %s",
psz_string );
}
else
{
- psz_string = malloc( [o_data length] + 1 );
+ psz_string = malloc( [o_data length] + 1 );
[o_data getBytes: psz_string];
psz_string[ [o_data length] ] = '\0';
}
NSLayoutManager *o_layout_manager = [[NSLayoutManager alloc] init];
NSTextContainer *o_container = [[NSTextContainer alloc]
initWithContainerSize: NSMakeSize(i_width, 2000)];
-
+
[o_layout_manager addTextContainer: o_container];
[o_container release];
[o_storage addLayoutManager: o_layout_manager];
[o_layout_manager release];
-
+
o_wrapped = [o_in_string mutableCopy];
glyphRange = [o_layout_manager glyphRangeForTextContainer: o_container];
-
+
for( glyphIndex = glyphRange.location ; glyphIndex < NSMaxRange(glyphRange) ;
glyphIndex += effectiveRange.length) {
lineFragmentRect = [o_layout_manager lineFragmentRectForGlyphAtIndex: glyphIndex
o_out_string = [NSString stringWithString: o_wrapped];
[o_wrapped release];
[o_storage release];
-
+
return o_out_string;
}
int i;
val.i_int = 0;
- p_hotkeys = VLCIntf->p_vlc->p_hotkeys;
+ p_hotkeys = p_intf->p_vlc->p_hotkeys;
i_pressed_modifiers = [o_event modifierFlags];
key = [[o_event charactersIgnoringModifiers] characterAtIndex: 0];
+ switch( key )
+ {
+ case NSDeleteCharacter:
+ case NSDeleteFunctionKey:
+ case NSDeleteCharFunctionKey:
+ case NSBackspaceCharacter:
+ case NSUpArrowFunctionKey:
+ case NSDownArrowFunctionKey:
+ case NSRightArrowFunctionKey:
+ case NSLeftArrowFunctionKey:
+ case NSEnterCharacter:
+ case NSCarriageReturnCharacter:
+ return NO;
+ }
+
val.i_int |= CocoaKeyToVLC( key );
for( i = 0; p_hotkeys[i].psz_action != NULL; i++ )
{
if( p_hotkeys[i].i_key == val.i_int )
{
- var_Set( VLCIntf->p_vlc, "key-pressed", val );
+ var_Set( p_intf->p_vlc, "key-pressed", val );
return YES;
}
}
{
return o_info;
}
- return nil;
+ return nil;
+}
+
+- (id)getWizard
+{
+ if ( o_wizard )
+ {
+ return o_wizard;
+ }
+ return nil;
+}
+
+- (id)getBookmarks
+{
+ 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;
}
- (void)manage
{
- NSDate * o_sleep_date;
+ playlist_t * p_playlist;
+
+ /* new thread requires a new pool */
NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
vlc_thread_set_priority( p_intf, VLC_THREAD_PRIORITY_LOW );
+ p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist != NULL )
+ {
+ 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 );
+ }
+
while( !p_intf->b_die )
{
- playlist_t * p_playlist;
- vlc_value_t val;
vlc_mutex_lock( &p_intf->change_lock );
- p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
- if( p_playlist != NULL )
+ if( p_intf->p_sys->p_input == NULL )
{
- var_AddCallback( p_playlist, "intf-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "item-change", PlaylistChanged, self );
- var_AddCallback( p_playlist, "playlist-current", PlaylistChanged, self );
+ p_intf->p_sys->p_input = p_playlist->p_input;
-#define p_input p_playlist->p_input
-
- if( p_input )
+ /* Refresh the interface */
+ if( p_intf->p_sys->p_input )
{
- if( !p_input->b_die )
- {
- vlc_value_t val;
-
- /* New input or stream map change */
- msg_Dbg( p_intf, "stream has changed, refreshing interface" );
- p_intf->p_sys->b_playing = TRUE;
- p_intf->p_sys->b_current_title_update = 1;
- p_intf->p_sys->b_intf_update = TRUE;
-
- if( var_Get( (vlc_object_t *)p_input, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_input_update = TRUE;
- }
- }
+ msg_Dbg( p_intf, "input has changed, refreshing interface" );
+ p_intf->p_sys->b_input_update = VLC_TRUE;
}
- else if( p_intf->p_sys->b_playing && !p_intf->b_die )
- {
- p_intf->p_sys->b_playing = FALSE;
- }
-
-#undef p_input
- vlc_object_release( p_playlist );
-
- if( var_Get( p_intf, "intf-change", &val )
- >= 0 && val.b_bool )
- {
- p_intf->p_sys->b_fullscreen_update = TRUE;
- }
- val.b_bool = VLC_FALSE;
- var_Set( p_intf,"intf-change",val);
+ }
+ else if( p_intf->p_sys->p_input->b_die || p_intf->p_sys->p_input->b_dead )
+ {
+ /* 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;
}
- vlc_mutex_unlock( &p_intf->change_lock );
+ /* Manage volume status */
+ [self manageVolumeSlider];
- o_sleep_date = [NSDate dateWithTimeIntervalSinceNow: .5];
- [NSThread sleepUntilDate: o_sleep_date];
+ vlc_mutex_unlock( &p_intf->change_lock );
+ msleep( 100000 );
}
-
- [self terminate];
[o_pool release];
}
- (void)manageIntf:(NSTimer *)o_timer
{
+ vlc_value_t val;
+
if( p_intf->p_vlc->b_die == VLC_TRUE )
{
[o_timer invalidate];
return;
}
- playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist == NULL )
- {
- return;
- }
-
- if ( p_intf->p_sys->b_playlist_update )
+ if( p_intf->p_sys->b_input_update )
{
- [o_playlist playlistUpdated];
- p_intf->p_sys->b_playlist_update = VLC_FALSE;
- }
-
- if( p_intf->p_sys->b_current_title_update )
- {
- NSString *o_temp;
- vout_thread_t *p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- vlc_mutex_lock( &p_playlist->object_lock );
- o_temp = [NSString stringWithUTF8String:
- p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
- if( o_temp == NULL )
- o_temp = [NSString stringWithCString:
- p_playlist->pp_items[p_playlist->i_index]->input.psz_name];
- vlc_mutex_unlock( &p_playlist->object_lock );
- [o_scrollfield setStringValue: o_temp ];
-
- if( p_vout != NULL )
- {
- id o_vout_wnd;
- NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
-
- while( ( o_vout_wnd = [o_enum nextObject] ) )
- {
- if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"] )
- {
- [o_vout_wnd updateTitle];
- }
- }
- vlc_object_release( (vlc_object_t *)p_vout );
- }
- [o_playlist updateRowSelection];
-
- p_intf->p_sys->b_current_title_update = FALSE;
+ /* 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;
}
-
- vlc_mutex_lock( &p_playlist->object_lock );
-
-#define p_input p_playlist->p_input
-
if( p_intf->p_sys->b_intf_update )
{
vlc_bool_t b_input = VLC_FALSE;
vlc_bool_t b_seekable = VLC_FALSE;
vlc_bool_t b_chapters = VLC_FALSE;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
b_plmul = p_playlist->i_size > 1;
- if( ( b_input = ( p_input != NULL ) ) )
+ vlc_object_release( p_playlist );
+
+ if( ( b_input = ( p_intf->p_sys->p_input != NULL ) ) )
{
+ vlc_object_yield( p_intf->p_sys->p_input );
/* seekable streams */
- b_seekable = (BOOL)f_slider_old;
+ b_seekable = var_GetBool( p_intf->p_sys->p_input, "seekable" );
/* check wether slow/fast motion is possible*/
- b_control = p_input->input.b_can_pace_control;
+ b_control = p_intf->p_sys->p_input->input.b_can_pace_control;
/* chapters & titles */
- //b_chapters = p_input->stream.i_area_nb > 1;
+ //b_chapters = p_intf->p_sys->p_input->stream.i_area_nb > 1;
+ vlc_object_release( p_intf->p_sys->p_input );
}
[o_btn_stop setEnabled: b_input];
[o_timeslider setEnabled: b_seekable];
[o_timefield setStringValue: @"0:00:00"];
- [self manageVolumeSlider];
+ [o_embedded_window setSeekable: b_seekable];
+
p_intf->p_sys->b_intf_update = VLC_FALSE;
}
+ if( p_intf->p_sys->b_playmode_update )
+ {
+ [o_playlist playModeUpdated];
+ p_intf->p_sys->b_playmode_update = VLC_FALSE;
+ }
+ if( p_intf->p_sys->b_playlist_update )
+ {
+ [o_playlist playlistUpdated];
+ p_intf->p_sys->b_playlist_update = VLC_FALSE;
+ }
+
if( p_intf->p_sys->b_fullscreen_update )
{
- vout_thread_t * p_vout;
- vlc_value_t val;
-
- [o_btn_fullscreen setState: ( var_Get( p_playlist, "fullscreen", &val )>=0 && val.b_bool ) ];
-
- p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT, FIND_ANYWHERE );
- if( p_vout != NULL )
- {
- [o_btn_fullscreen setEnabled: VLC_TRUE];
- vlc_object_release( p_vout );
- }
- else
- {
- [o_btn_fullscreen setEnabled: VLC_FALSE];
- }
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ 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;
}
- if( p_intf->p_sys->b_playing && p_input != NULL )
+ if( p_intf->p_sys->b_intf_show )
{
- vlc_value_t time;
- NSString * o_time;
- mtime_t i_seconds;
+ [o_window makeKeyAndOrderFront: self];
+
+ p_intf->p_sys->b_intf_show = VLC_FALSE;
+ }
+
+ if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ {
+ vlc_value_t val;
- if( (BOOL)f_slider_old )
+ if( p_intf->p_sys->b_current_title_update )
{
+ NSString *o_temp;
+ vout_thread_t *p_vout;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+
+ if( p_playlist == NULL || p_playlist->status.p_item == NULL )
+ {
+ 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];
+
+ p_vout = vlc_object_find( p_intf->p_sys->p_input, VLC_OBJECT_VOUT,
+ FIND_PARENT );
+ if( p_vout != NULL )
+ {
+ id o_vout_wnd;
+ NSEnumerator * o_enum = [[NSApp orderedWindows] objectEnumerator];
+
+ while( ( o_vout_wnd = [o_enum nextObject] ) )
+ {
+ if( [[o_vout_wnd className] isEqualToString: @"VLCWindow"]
+ || [[[VLCMain sharedInstance] getEmbeddedList]
+ windowContainsEmbedded: o_vout_wnd] )
+ {
+ msg_Dbg( p_intf, "updateTitle call getVoutView" );
+ [[o_vout_wnd getVoutView] updateTitle];
+ }
+ }
+ vlc_object_release( (vlc_object_t *)p_vout );
+ }
+ [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] )
+ {
+ /* Update the slider */
+ vlc_value_t time;
+ NSString * o_time;
+ mtime_t i_seconds;
vlc_value_t pos;
float f_updated;
-
- var_Get( p_input, "position", &pos );
+
+ var_Get( p_intf->p_sys->p_input, "position", &pos );
f_updated = 10000. * pos.f_float;
+ [o_timeslider setFloatValue: f_updated];
- if( f_slider != f_updated )
- {
- [o_timeslider setFloatValue: f_updated];
- }
+ var_Get( p_intf->p_sys->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_timefield setStringValue: o_time];
+ [o_embedded_window setTime: o_time position: 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_timefield setStringValue: o_time];
- }
- if( p_input )
- {
- vlc_value_t val;
- var_Get( p_input, "state", &val );
- if( val.i_int != PAUSE_S )
+ if( p_intf->p_sys->b_volume_update )
{
- p_intf->p_sys->b_play_status = TRUE;
+ 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_vlc, "volume-step" );
+ [o_volumeslider setFloatValue: (float)i_lastShownVolume / i_volume_step];
+ [o_volumeslider setEnabled: TRUE];
+ p_intf->p_sys->b_mute = ( i_lastShownVolume == 0 );
+ p_intf->p_sys->b_volume_update = FALSE;
}
- else
+
+ /* Manage Playing status */
+ var_Get( p_intf->p_sys->p_input, "state", &val );
+ if( p_intf->p_sys->i_play_status != val.i_int )
{
- p_intf->p_sys->b_play_status = FALSE;
+ 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];
}
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
}
else
{
- p_intf->p_sys->b_play_status = FALSE;
- [self playStatusUpdated: p_intf->p_sys->b_play_status];
+ 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];
}
-#undef p_input
-
- vlc_mutex_unlock( &p_playlist->object_lock );
- vlc_object_release( p_playlist );
[self updateMessageArray];
- [NSTimer scheduledTimerWithTimeInterval: 0.5
+ if( (i_end_scroll != -1) && (mdate() > i_end_scroll) )
+ [self resetScrollField];
+
+
+ [NSTimer scheduledTimerWithTimeInterval: 0.3
target: self selector: @selector(manageIntf:)
userInfo: nil repeats: FALSE];
}
- (void)setupMenus
{
- playlist_t *p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
- FIND_ANYWHERE );
-
- if( p_playlist != NULL )
+#define p_input p_intf->p_sys->p_input
+ if( p_input != NULL )
{
-#define p_input p_playlist->p_input
- if( p_input != NULL )
+ [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
+ var: "program" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
+ var: "title" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
+ var: "chapter" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
+ var: "audio-es" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
+ var: "video-es" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
+ var: "spu-es" selector: @selector(toggleVar:)];
+
+ aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
+ FIND_ANYWHERE );
+ if ( p_aout != NULL )
{
- [o_controls setupVarMenuItem: o_mi_program target: (vlc_object_t *)p_input
- var: "program" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_title target: (vlc_object_t *)p_input
- var: "title" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_chapter target: (vlc_object_t *)p_input
- var: "chapter" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_audiotrack target: (vlc_object_t *)p_input
- var: "audio-es" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_videotrack target: (vlc_object_t *)p_input
- var: "video-es" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_subtitle target: (vlc_object_t *)p_input
- var: "spu-es" selector: @selector(toggleVar:)];
-
- aout_instance_t * p_aout = vlc_object_find( p_intf, VLC_OBJECT_AOUT,
- FIND_ANYWHERE );
- if ( p_aout != NULL )
- {
- [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
- var: "audio-channels" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
- var: "audio-device" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
- var: "visual" selector: @selector(toggleVar:)];
- vlc_object_release( (vlc_object_t *)p_aout );
- }
-
- vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
- FIND_ANYWHERE );
-
- if ( p_vout != NULL )
+ [o_controls setupVarMenuItem: o_mi_channels target: (vlc_object_t *)p_aout
+ var: "audio-channels" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_device target: (vlc_object_t *)p_aout
+ var: "audio-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_visual target: (vlc_object_t *)p_aout
+ var: "visual" selector: @selector(toggleVar:)];
+ vlc_object_release( (vlc_object_t *)p_aout );
+ }
+
+ vout_thread_t * p_vout = vlc_object_find( p_intf, VLC_OBJECT_VOUT,
+ FIND_ANYWHERE );
+
+ if ( p_vout != NULL )
+ {
+ vlc_object_t * p_dec_obj;
+
+ [o_controls setupVarMenuItem: o_mi_aspect_ratio target: (vlc_object_t *)p_vout
+ var: "aspect-ratio" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_crop target: (vlc_object_t *) p_vout
+ var: "crop" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
+ var: "video-device" selector: @selector(toggleVar:)];
+
+ [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
+ var: "deinterlace" selector: @selector(toggleVar:)];
+
+ p_dec_obj = (vlc_object_t *)vlc_object_find(
+ (vlc_object_t *)p_vout,
+ VLC_OBJECT_DECODER,
+ FIND_PARENT );
+ if ( p_dec_obj != NULL )
{
- [o_controls setupVarMenuItem: o_mi_screen target: (vlc_object_t *)p_vout
- var: "video-device" selector: @selector(toggleVar:)];
-
- [o_controls setupVarMenuItem: o_mi_deinterlace target: (vlc_object_t *)p_vout
- var: "deinterlace" selector: @selector(toggleVar:)];
- vlc_object_release( (vlc_object_t *)p_vout );
+ [o_controls setupVarMenuItem: o_mi_ffmpeg_pp target:
+ (vlc_object_t *)p_dec_obj var:"ffmpeg-pp-q" selector:
+ @selector(toggleVar:)];
+
+ vlc_object_release(p_dec_obj);
}
+ vlc_object_release( (vlc_object_t *)p_vout );
}
+ }
#undef p_input
+}
+
+- (void)setScrollField:(NSString *)o_string stopAfter:(int)timeout
+{
+ if( timeout != -1 )
+ i_end_scroll = mdate() + timeout;
+ else
+ i_end_scroll = -1;
+ [o_scrollfield setStringValue: o_string];
+}
+
+- (void)resetScrollField
+{
+ i_end_scroll = -1;
+ if( p_intf->p_sys->p_input && !p_intf->p_sys->p_input->b_die )
+ {
+ NSString *o_temp;
+ playlist_t * p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
+ FIND_ANYWHERE );
+ if( p_playlist == NULL )
+ {
+ 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];
+ vlc_object_release( p_playlist );
+ return;
}
- vlc_object_release( (vlc_object_t *)p_playlist );
+ [self setScrollField: _NS("VLC media player") stopAfter:-1];
}
- (void)updateMessageArray
}
}
-- (void)playStatusUpdated:(BOOL)b_pause
+- (void)playStatusUpdated:(int)i_status
{
- if( b_pause )
+ if( i_status == PLAYING_S )
{
[o_btn_play setImage: o_img_pause];
[o_btn_play setAlternateImage: o_img_pause_pressed];
[o_mi_subtitle setEnabled: b_enabled];
[o_mi_channels setEnabled: b_enabled];
[o_mi_deinterlace setEnabled: b_enabled];
+ [o_mi_ffmpeg_pp setEnabled: b_enabled];
[o_mi_device setEnabled: b_enabled];
[o_mi_screen setEnabled: b_enabled];
+ [o_mi_aspect_ratio setEnabled: b_enabled];
+ [o_mi_crop setEnabled: b_enabled];
}
- (void)manageVolumeSlider
{
audio_volume_t i_volume;
-
aout_VolumeGet( p_intf, &i_volume );
- [o_volumeslider setFloatValue: (float)i_volume / AOUT_VOLUME_STEP];
- [o_volumeslider setEnabled: TRUE];
-
- p_intf->p_sys->b_mute = ( i_volume == 0 );
+ if( i_volume != i_lastShownVolume )
+ {
+ i_lastShownVolume = i_volume;
+ p_intf->p_sys->b_volume_update = TRUE;
+ }
}
- (IBAction)timesliderUpdate:(id)sender
{
- intf_thread_t * p_intf;
- input_thread_t * p_input;
+#define p_input p_intf->p_sys->p_input
float f_updated;
switch( [[NSApp currentEvent] type] )
return;
}
- p_input = vlc_object_find( p_intf, VLC_OBJECT_INPUT,
- FIND_ANYWHERE );
-
if( p_input != NULL )
{
vlc_value_t time;
+ vlc_value_t pos;
mtime_t i_seconds;
NSString * o_time;
- if( (BOOL)f_slider_old )
- {
- vlc_value_t pos;
- pos.f_float = f_updated / 10000.;
- if( f_slider != f_updated )
- {
- var_Set( p_input, "position", pos );
- [o_timeslider setFloatValue: f_updated];
- }
- }
-
+ 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_timefield setStringValue: o_time];
- vlc_object_release( p_input );
+ [o_embedded_window setTime: o_time position: f_updated];
}
+#undef p_input
}
- (void)terminate
playlist_t * p_playlist;
vout_thread_t * p_vout;
+#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 */
if( ( p_playlist = vlc_object_find( p_intf, VLC_OBJECT_PLAYLIST,
FIND_ANYWHERE ) ) )
}
msleep( 500000 );
+ /* save the prefs if they were changed in the extended panel */
+ if (o_extended && [o_extended getConfigChanged])
+ {
+ [o_extended savePrefs];
+ }
+
+ p_intf->b_interaction = VLC_FALSE;
+ var_DelCallback( p_intf, "interaction", InteractCallback, 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 )
+ [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_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
-
+
if( o_img_pause_pressed != nil )
{
[o_img_pause_pressed release];
o_img_pause_pressed = nil;
}
-
+
if( o_img_pause != nil )
{
[o_img_pause release];
/* write cached user defaults to disk */
[[NSUserDefaults standardUserDefaults] synchronize];
-
+
p_intf->b_die = VLC_TRUE;
- [NSApp stop:NULL];
}
- (IBAction)clearRecentItems:(id)sender
- (void)openRecentItem:(id)sender
{
- [self application: nil openFile: [sender title]];
+ [self application: nil openFile: [sender title]];
+}
+
+- (IBAction)intfOpenFile:(id)sender
+{
+ if (!nib_open_loaded)
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openFile];
+ } else {
+ [o_open openFile];
+ }
+}
+
+- (IBAction)intfOpenFileGeneric:(id)sender
+{
+ if (!nib_open_loaded)
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openFileGeneric];
+ } else {
+ [o_open openFileGeneric];
+ }
+}
+
+- (IBAction)intfOpenDisc:(id)sender
+{
+ if (!nib_open_loaded)
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openDisc];
+ } else {
+ [o_open openDisc];
+ }
+}
+
+- (IBAction)intfOpenNet:(id)sender
+{
+ if (!nib_open_loaded)
+ {
+ nib_open_loaded = [NSBundle loadNibNamed:@"Open" owner:self];
+ [o_open awakeFromNib];
+ [o_open openNet];
+ } else {
+ [o_open openNet];
+ }
+}
+
+- (IBAction)showWizard:(id)sender
+{
+ if (!nib_wizard_loaded)
+ {
+ nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+ [o_wizard initStrings];
+ [o_wizard resetWizard];
+ [o_wizard showWizard];
+ } else {
+ [o_wizard resetWizard];
+ [o_wizard showWizard];
+ }
+}
+
+- (IBAction)showExtended:(id)sender
+{
+ if ( o_extended == nil )
+ {
+ o_extended = [[VLCExtended alloc] init];
+ }
+ 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];
+ }
+}
+
+- (IBAction)showBookmarks:(id)sender
+{
+ /* we need the wizard-nib for the bookmarks's extract functionality */
+ if (!nib_wizard_loaded)
+ {
+ nib_wizard_loaded = [NSBundle loadNibNamed:@"Wizard" owner:self];
+ [o_wizard initStrings];
+ }
+
+ if (!nib_bookmarks_loaded)
+ {
+ nib_bookmarks_loaded = [NSBundle loadNibNamed:@"Bookmarks" owner:self];
+ [o_bookmarks showBookmarks];
+ } else {
+ [o_bookmarks showBookmarks];
+ }
+}
+
+- (IBAction)viewAbout:(id)sender
+{
+ if (!nib_about_loaded)
+ {
+ nib_about_loaded = [NSBundle loadNibNamed:@"About" owner:self];
+ [o_about showPanel];
+ } else {
+ [o_about showPanel];
+ }
}
- (IBAction)viewPreferences:(id)sender
{
+/* GRUIIIIIIIK */
+ if( o_prefs == nil )
+ o_prefs = [[VLCPrefs alloc] init];
[o_prefs showPrefs];
}
+- (IBAction)checkForUpdate:(id)sender
+{
+ if (!nib_update_loaded)
+ {
+ nib_update_loaded = [NSBundle loadNibNamed:@"Update" owner:self];
+ [o_update showUpdateWindow];
+ } else {
+ [o_update showUpdateWindow];
+ }
+}
+
- (IBAction)closeError:(id)sender
{
vlc_value_t val;
- (IBAction)openReadMe:(id)sender
{
- NSString * o_path = [[NSBundle mainBundle]
- pathForResource: @"README.MacOSX" ofType: @"rtf"];
+ NSString * o_path = [[NSBundle mainBundle]
+ pathForResource: @"README.MacOSX" ofType: @"rtf"];
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"TextEdit"];
}
- (IBAction)openDocumentation:(id)sender
{
- NSURL * o_url = [NSURL URLWithString:
+ NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/doc/"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
- (IBAction)reportABug:(id)sender
{
- NSURL * o_url = [NSURL URLWithString:
+ NSURL * o_url = [NSURL URLWithString:
@"http://www.videolan.org/support/bug-reporting.html"];
[[NSWorkspace sharedWorkspace] openURL: o_url];
- (IBAction)openLicense:(id)sender
{
- NSString * o_path = [[NSBundle mainBundle]
+ NSString * o_path = [[NSBundle mainBundle]
pathForResource: @"COPYING" ofType: nil];
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[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)openDonate:(id)sender
+{
+ NSURL * o_url = [NSURL URLWithString: @"http://www.videolan.org/contribute.html#paypal"];
+
+ [[NSWorkspace sharedWorkspace] openURL: o_url];
+}
+
- (IBAction)openCrashLog:(id)sender
{
NSString * o_path = [@"~/Library/Logs/CrashReporter/VLC.crash.log"
- stringByExpandingTildeInPath];
+ stringByExpandingTildeInPath];
+
-
if ( [[NSFileManager defaultManager] fileExistsAtPath: o_path ] )
{
- [[NSWorkspace sharedWorkspace] openFile: o_path
+ [[NSWorkspace sharedWorkspace] openFile: o_path
withApplication: @"Console"];
}
else
{
- NSBeginInformationalAlertSheet(_NS("No CrashLog found"), @"Continue", nil, nil, o_msgs_panel, self, NULL, NULL, nil, _NS("Either you are running Mac OS X pre 10.2 or you haven't experienced any heavy crashes yet.") );
+ 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.") );
}
}
id o_msg;
NSEnumerator * o_enum;
- [o_messages setString: @""];
+ [o_messages setString: @""];
[o_msg_lock lock];
}
}
+- (IBAction)togglePlaylist:(id)sender
+{
+ NSRect o_rect = [o_window frame];
+ /*First, check if the playlist is visible*/
+ if( o_rect.size.height <= 200 )
+ {
+ 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 )
+ {
+ 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 )
+ {
+ 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;
+ [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;
+
+ [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_window setFrame: o_rect display:YES animate: YES];
+}
+
+- (void)updateTogglePlaylistState
+{
+ if( [o_window frame].size.height <= 200 )
+ {
+ [o_btn_playlist setState: NO];
+ }
+ else
+ {
+ [o_btn_playlist setState: YES];
+ }
+}
+
+- (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 )
+ {
+ if( b_small_window == NO )
+ {
+ /* if large and going to small then hide */
+ b_small_window = YES;
+ [o_playlist_view setAutoresizesSubviews: NO];
+ [o_playlist_view removeFromSuperview];
+ }
+ return NSMakeSize( proposedFrameSize.width, [o_window minSize].height);
+ }
+ return proposedFrameSize;
+}
+
+- (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 )];
+ [o_playlist_view setNeedsDisplay:YES];
+ [[o_window contentView] addSubview: o_playlist_view];
+ b_small_window = NO;
+ }
+ [self updateTogglePlaylistState];
+}
+
@end
@implementation VLCMain (NSMenuValidation)
NSString *o_title = [o_mi title];
BOOL bEnabled = TRUE;
- if( [o_title isEqualToString: _NS("License")] )
- {
- /* we need to do this only once */
- [self setupMenus];
- }
-
/* Recent Items Menu */
if( [o_title isEqualToString: _NS("Clear Menu")] )
{
[o_menu insertItemWithTitle: o_doc
action: @selector(openRecentItem:)
- keyEquivalent: @"" atIndex: 0];
+ keyEquivalent: @"" atIndex: 0];
if( i_nb_docs == 0 )
{
break;
}
- }
+ }
}
else
{
NSValue * o_value;
NSInvocation * o_inv;
NSConditionLock * o_lock;
-
+
o_data = [[o_msg components] lastObject];
- o_inv = *((NSInvocation **)[o_data bytes]);
+ o_inv = *((NSInvocation **)[o_data bytes]);
[o_inv getArgument: &o_value atIndex: 2];
val = (id **)[o_value pointerValue];
[o_inv setArgument: val[1] atIndex: 2];
projects / vlc / blobdiff