/*****************************************************************************
* MainWindow.m: MacOS X interface module
*****************************************************************************
- * Copyright (C) 2002-2012 VLC authors and VideoLAN
+ * Copyright (C) 2002-2013 VLC authors and VideoLAN
* $Id$
*
* Authors: Felix Paul Kühne <fkuehne -at- videolan -dot- org>
* Jon Lech Johansen <jon-vl@nanocrew.net>
* Christophe Massiot <massiot@via.ecp.fr>
* Derk-Jan Hartman <hartman at videolan.org>
+ * David Fuhrmann <david dot fuhrmann at googlemail dot com>
*
* 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
#import "SideBarItem.h"
#import <math.h>
#import <vlc_playlist.h>
-#import <vlc_aout_intf.h>
#import <vlc_url.h>
#import <vlc_strings.h>
#import <vlc_services_discovery.h>
-#import <vlc_aout_intf.h>
+
+#import "ControlsBar.h"
+#import "VideoView.h"
+#import "VLCVoutWindowController.h"
+
+
+@interface VLCMainWindow (Internal)
+- (void)resizePlaylistAfterCollapse;
+- (void)makeSplitViewVisible;
+- (void)makeSplitViewHidden;
+- (void)showPodcastControls;
+- (void)hidePodcastControls;
+@end
+
@implementation VLCMainWindow
-static const float f_min_video_height = 70.0;
+
+@synthesize nativeFullscreenMode=b_nativeFullscreenMode;
+@synthesize nonembedded=b_nonembedded;
+@synthesize fsPanel=o_fspanel;
static VLCMainWindow *_o_sharedInstance = nil;
- (id)init
{
- if( _o_sharedInstance )
- {
+ if (_o_sharedInstance) {
[self dealloc];
return _o_sharedInstance;
- }
- else
- {
+ } else
_o_sharedInstance = [super init];
- }
return _o_sharedInstance;
}
- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
backing:(NSBackingStoreType)backingType defer:(BOOL)flag
{
- b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
-
- if (b_dark_interface)
- {
-#ifdef MAC_OS_X_VERSION_10_7
- if (OSX_LION)
- styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
- else
- styleMask = NSBorderlessWindowMask;
-#else
- styleMask = NSBorderlessWindowMask;
-#endif
- }
-
self = [super initWithContentRect:contentRect styleMask:styleMask
backing:backingType defer:flag];
_o_sharedInstance = self;
[[VLCMain sharedInstance] updateTogglePlaylistState];
- /* we want to be moveable regardless of our style */
- [self setMovableByWindowBackground: YES];
-
- /* we don't want this window to be restored on relaunch */
- if (OSX_LION)
- [self setRestorable:NO];
-
return self;
}
char *key;
NSString *o_key;
- key = config_GetPsz( VLCIntf, keyString );
+ key = config_GetPsz(VLCIntf, keyString);
o_key = [NSString stringWithFormat:@"%s", key];
- FREENULL( key );
+ FREENULL(key);
- unsigned int i_keyModifiers = [[VLCMain sharedInstance] VLCModifiersToCocoa:o_key];
+ unsigned int i_keyModifiers = [[VLCStringUtility sharedInstance] VLCModifiersToCocoa:o_key];
- return [[[o_event charactersIgnoringModifiers] lowercaseString] isEqualToString: [[VLCMain sharedInstance] VLCKeyToString: o_key]] &&
- (i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) &&
- (i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) &&
- (i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) &&
- (i_keyModifiers & NSCommandKeyMask) == ([o_event modifierFlags] & NSCommandKeyMask);
+ NSString * characters = [o_event charactersIgnoringModifiers];
+ if ([characters length] > 0) {
+ return [[characters lowercaseString] isEqualToString: [[VLCStringUtility sharedInstance] VLCKeyToString: o_key]] &&
+ (i_keyModifiers & NSShiftKeyMask) == ([o_event modifierFlags] & NSShiftKeyMask) &&
+ (i_keyModifiers & NSControlKeyMask) == ([o_event modifierFlags] & NSControlKeyMask) &&
+ (i_keyModifiers & NSAlternateKeyMask) == ([o_event modifierFlags] & NSAlternateKeyMask) &&
+ (i_keyModifiers & NSCommandKeyMask) == ([o_event modifierFlags] & NSCommandKeyMask);
+ }
+ return NO;
}
- (BOOL)performKeyEquivalent:(NSEvent *)o_event
{
BOOL b_force = NO;
// these are key events which should be handled by vlc core, but are attached to a main menu item
- if( ![self isEvent: o_event forKey: "key-vol-up"] &&
+ if (![self isEvent: o_event forKey: "key-vol-up"] &&
![self isEvent: o_event forKey: "key-vol-down"] &&
- ![self isEvent: o_event forKey: "key-vol-mute"] )
- {
+ ![self isEvent: o_event forKey: "key-vol-mute"] &&
+ ![self isEvent: o_event forKey: "key-prev"] &&
+ ![self isEvent: o_event forKey: "key-next"] &&
+ ![self isEvent: o_event forKey: "key-jump+short"] &&
+ ![self isEvent: o_event forKey: "key-jump-short"]) {
/* We indeed want to prioritize some Cocoa key equivalent against libvlc,
so we perform the menu equivalent now. */
- if([[NSApp mainMenu] performKeyEquivalent:o_event])
+ if ([[NSApp mainMenu] performKeyEquivalent:o_event])
return TRUE;
}
else
[[NSNotificationCenter defaultCenter] removeObserver: self];
[o_sidebaritems release];
- if( o_extra_video_window )
- {
- [o_extra_video_window release];
- o_extra_video_window = nil;
- }
-
[super dealloc];
}
- (void)awakeFromNib
{
+ // sets lion fullscreen behaviour
+ [super awakeFromNib];
+
BOOL b_splitviewShouldBeHidden = NO;
/* setup the styled interface */
- b_video_deco = config_GetInt( VLCIntf, "video-deco" );
b_nativeFullscreenMode = NO;
#ifdef MAC_OS_X_VERSION_10_7
- if( OSX_LION && b_video_deco )
- b_nativeFullscreenMode = config_GetInt( VLCIntf, "macosx-nativefullscreenmode" );
+ if (!OSX_SNOW_LEOPARD)
+ b_nativeFullscreenMode = var_InheritBool(VLCIntf, "macosx-nativefullscreenmode");
#endif
- t_hide_mouse_timer = nil;
- [o_detached_video_window setDelegate: self];
[self useOptimizedDrawing: YES];
- [o_play_btn setToolTip: _NS("Play/Pause")];
- [o_detached_play_btn setToolTip: [o_play_btn toolTip]];
- [o_bwd_btn setToolTip: _NS("Backward")];
- [o_detached_bwd_btn setToolTip: [o_bwd_btn toolTip]];
- [o_fwd_btn setToolTip: _NS("Forward")];
- [o_detached_fwd_btn setToolTip: [o_fwd_btn toolTip]];
- [o_stop_btn setToolTip: _NS("Stop")];
- [o_playlist_btn setToolTip: _NS("Show/Hide Playlist")];
- [o_repeat_btn setToolTip: _NS("Repeat")];
- [o_shuffle_btn setToolTip: _NS("Shuffle")];
- [o_effects_btn setToolTip: _NS("Effects")];
- [o_fullscreen_btn setToolTip: _NS("Toggle Fullscreen mode")];
- [o_detached_fullscreen_btn setToolTip: [o_fullscreen_btn toolTip]];
[[o_search_fld cell] setPlaceholderString: _NS("Search")];
- [o_volume_sld setToolTip: _NS("Volume")];
- [o_volume_down_btn setToolTip: _NS("Mute")];
- [o_volume_up_btn setToolTip: _NS("Full Volume")];
- [o_time_sld setToolTip: _NS("Position")];
- [o_detached_time_sld setToolTip: [o_time_sld toolTip]];
+ [[o_search_fld cell] accessibilitySetOverrideValue:_NS("Enter a term to search the playlist. Results will be selected in the table.") forAttribute:NSAccessibilityDescriptionAttribute];
+
[o_dropzone_btn setTitle: _NS("Open media...")];
+ [[o_dropzone_btn cell] accessibilitySetOverrideValue:_NS("Click to open an advanced dialog to select the media to play. You can also drop files here to play.") forAttribute:NSAccessibilityDescriptionAttribute];
[o_dropzone_lbl setStringValue: _NS("Drop media here")];
- if (!b_dark_interface) {
- [o_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottom-background"] middle: [NSImage imageNamed:@"bottom-background"] right: [NSImage imageNamed:@"bottom-background"]];
- [o_detached_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottom-background"] middle: [NSImage imageNamed:@"bottom-background"] right: [NSImage imageNamed:@"bottom-background"]];
- [o_bwd_btn setImage: [NSImage imageNamed:@"back"]];
- [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed"]];
- [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back"]];
- [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed"]];
- o_play_img = [[NSImage imageNamed:@"play"] retain];
- o_play_pressed_img = [[NSImage imageNamed:@"play-pressed"] retain];
- o_pause_img = [[NSImage imageNamed:@"pause"] retain];
- o_pause_pressed_img = [[NSImage imageNamed:@"pause-pressed"] retain];
- [o_fwd_btn setImage: [NSImage imageNamed:@"forward"]];
- [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
- [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward"]];
- [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed"]];
- [o_stop_btn setImage: [NSImage imageNamed:@"stop"]];
- [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed"]];
- [o_playlist_btn setImage: [NSImage imageNamed:@"playlist-btn"]];
- [o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-btn-pressed"]];
- o_repeat_img = [[NSImage imageNamed:@"repeat"] retain];
- o_repeat_pressed_img = [[NSImage imageNamed:@"repeat-pressed"] retain];
- o_repeat_all_img = [[NSImage imageNamed:@"repeat-all"] retain];
- o_repeat_all_pressed_img = [[NSImage imageNamed:@"repeat-all-pressed"] retain];
- o_repeat_one_img = [[NSImage imageNamed:@"repeat-one"] retain];
- o_repeat_one_pressed_img = [[NSImage imageNamed:@"repeat-one-pressed"] retain];
- o_shuffle_img = [[NSImage imageNamed:@"shuffle"] retain];
- o_shuffle_pressed_img = [[NSImage imageNamed:@"shuffle-pressed"] retain];
- o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue"] retain];
- o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed"] retain];
- [o_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle"] right: [NSImage imageNamed:@"progression-track-wrapper-right"]];
- [o_detached_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle"] right: [NSImage imageNamed:@"progression-track-wrapper-right"]];
- [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low"]];
- [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track"]];
- [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high"]];
- if (b_nativeFullscreenMode)
- {
- [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button"]];
- [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue"]];
- }
- else
- {
- [o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons"]];
- [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed"]];
- }
- [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons"]];
- [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed"]];
- [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-one-button"]];
- [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-one-button-pressed"]];
- [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progression-fill-left"] middle:[NSImage imageNamed:@"progression-fill-middle"] right:[NSImage imageNamed:@"progression-fill-right"]];
- [o_detached_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progression-fill-left"] middle:[NSImage imageNamed:@"progression-fill-middle"] right:[NSImage imageNamed:@"progression-fill-right"]];
- }
- else
- {
- [o_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottomdark-left"] middle: [NSImage imageNamed:@"bottom-background_dark"] right: [NSImage imageNamed:@"bottomdark-right"]];
- [o_detached_bottombar_view setImagesLeft: [NSImage imageNamed:@"bottomdark-left"] middle: [NSImage imageNamed:@"bottom-background_dark"] right: [NSImage imageNamed:@"bottomdark-right"]];
- [o_bwd_btn setImage: [NSImage imageNamed:@"back_dark"]];
- [o_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed_dark"]];
- [o_detached_bwd_btn setImage: [NSImage imageNamed:@"back_dark"]];
- [o_detached_bwd_btn setAlternateImage: [NSImage imageNamed:@"back-pressed_dark"]];
- o_play_img = [[NSImage imageNamed:@"play_dark"] retain];
- o_play_pressed_img = [[NSImage imageNamed:@"play-pressed_dark"] retain];
- o_pause_img = [[NSImage imageNamed:@"pause_dark"] retain];
- o_pause_pressed_img = [[NSImage imageNamed:@"pause-pressed_dark"] retain];
- [o_fwd_btn setImage: [NSImage imageNamed:@"forward_dark"]];
- [o_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed_dark"]];
- [o_detached_fwd_btn setImage: [NSImage imageNamed:@"forward_dark"]];
- [o_detached_fwd_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed_dark"]];
- [o_stop_btn setImage: [NSImage imageNamed:@"stop_dark"]];
- [o_stop_btn setAlternateImage: [NSImage imageNamed:@"stop-pressed_dark"]];
- [o_playlist_btn setImage: [NSImage imageNamed:@"playlist_dark"]];
- [o_playlist_btn setAlternateImage: [NSImage imageNamed:@"playlist-pressed_dark"]];
- o_repeat_img = [[NSImage imageNamed:@"repeat_dark"] retain];
- o_repeat_pressed_img = [[NSImage imageNamed:@"repeat-pressed_dark"] retain];
- o_repeat_all_img = [[NSImage imageNamed:@"repeat-all-blue_dark"] retain];
- o_repeat_all_pressed_img = [[NSImage imageNamed:@"repeat-all-blue-pressed_dark"] retain];
- o_repeat_one_img = [[NSImage imageNamed:@"repeat-one-blue_dark"] retain];
- o_repeat_one_pressed_img = [[NSImage imageNamed:@"repeat-one-blue-pressed_dark"] retain];
- o_shuffle_img = [[NSImage imageNamed:@"shuffle_dark"] retain];
- o_shuffle_pressed_img = [[NSImage imageNamed:@"shuffle-pressed_dark"] retain];
- o_shuffle_on_img = [[NSImage imageNamed:@"shuffle-blue_dark"] retain];
- o_shuffle_on_pressed_img = [[NSImage imageNamed:@"shuffle-blue-pressed_dark"] retain];
- [o_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left_dark"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle_dark"] right: [NSImage imageNamed:@"progression-track-wrapper-right_dark"]];
- [o_detached_time_sld_background setImagesLeft: [NSImage imageNamed:@"progression-track-wrapper-left_dark"] middle: [NSImage imageNamed:@"progression-track-wrapper-middle_dark"] right: [NSImage imageNamed:@"progression-track-wrapper-right_dark"]];
- [o_volume_down_btn setImage: [NSImage imageNamed:@"volume-low_dark"]];
- [o_volume_track_view setImage: [NSImage imageNamed:@"volume-slider-track_dark"]];
- [o_volume_up_btn setImage: [NSImage imageNamed:@"volume-high_dark"]];
- if (b_nativeFullscreenMode)
- {
- [o_effects_btn setImage: [NSImage imageNamed:@"effects-one-button_dark"]];
- [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-one-button-blue_dark"]];
- }
- else
- {
- [o_effects_btn setImage: [NSImage imageNamed:@"effects-double-buttons_dark"]];
- [o_effects_btn setAlternateImage: [NSImage imageNamed:@"effects-double-buttons-pressed_dark"]];
- }
- [o_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-double-buttons_dark"]];
- [o_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-double-buttons-pressed_dark"]];
- [o_detached_fullscreen_btn setImage: [NSImage imageNamed:@"fullscreen-one-button_dark"]];
- [o_detached_fullscreen_btn setAlternateImage: [NSImage imageNamed:@"fullscreen-one-button-pressed_dark"]];
- [o_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progressbar-fill-left_dark"] middle:[NSImage imageNamed:@"progressbar-fill-middle_dark"] right:[NSImage imageNamed:@"progressbar-fill-right_dark"]];
- [o_detached_time_sld_fancygradient_view setImagesLeft:[NSImage imageNamed:@"progressbar-fill-left_dark"] middle:[NSImage imageNamed:@"progressbar-fill-middle_dark"] right:[NSImage imageNamed:@"progressbar-fill-right_dark"]];
- }
- [o_repeat_btn setImage: o_repeat_img];
- [o_repeat_btn setAlternateImage: o_repeat_pressed_img];
- [o_shuffle_btn setImage: o_shuffle_img];
- [o_shuffle_btn setAlternateImage: o_shuffle_pressed_img];
- [o_play_btn setImage: o_play_img];
- [o_play_btn setAlternateImage: o_play_pressed_img];
- [o_detached_play_btn setImage: o_play_img];
- [o_detached_play_btn setAlternateImage: o_play_pressed_img];
- BOOL b_mute = ![[VLCCoreInteraction sharedInstance] isMuted];
- [o_volume_sld setEnabled: b_mute];
- [o_volume_up_btn setEnabled: b_mute];
-
- b_show_jump_buttons = config_GetInt( VLCIntf, "macosx-show-playback-buttons" );
- if (b_show_jump_buttons)
- [self addJumpButtons];
+ [o_podcast_add_btn setTitle: _NS("Subscribe")];
+ [o_podcast_remove_btn setTitle: _NS("Unsubscribe")];
+ [o_podcast_subscribe_title_lbl setStringValue: _NS("Subscribe to a podcast")];
+ [o_podcast_subscribe_subtitle_lbl setStringValue: _NS("Enter URL of the podcast to subscribe to:")];
+ [o_podcast_subscribe_cancel_btn setTitle: _NS("Cancel")];
+ [o_podcast_subscribe_ok_btn setTitle: _NS("Subscribe")];
+ [o_podcast_unsubscribe_title_lbl setStringValue: _NS("Unsubscribe from a podcast")];
+ [o_podcast_unsubscribe_subtitle_lbl setStringValue: _NS("Select the podcast you would like to unsubscribe from:")];
+ [o_podcast_unsubscribe_ok_btn setTitle: _NS("Unsubscribe")];
+ [o_podcast_unsubscribe_cancel_btn setTitle: _NS("Cancel")];
/* interface builder action */
- float f_threshold_height = f_min_video_height + [o_bottombar_view frame].size.height;
- if( b_dark_interface )
+ float f_threshold_height = f_min_video_height + [o_controls_bar height];
+ if (b_dark_interface)
f_threshold_height += [o_titlebar_view frame].size.height;
- if( [[self contentView] frame].size.height < f_threshold_height )
+ if ([[self contentView] frame].size.height < f_threshold_height)
b_splitviewShouldBeHidden = YES;
[self setDelegate: self];
[self setExcludedFromWindowsMenu: YES];
[self setAcceptsMouseMovedEvents: YES];
// Set that here as IB seems to be buggy
- if (b_dark_interface && b_video_deco)
- {
+ if (b_dark_interface)
[self setContentMinSize:NSMakeSize(604., 288. + [o_titlebar_view frame].size.height)];
- [o_detached_video_window setContentMinSize: NSMakeSize( 363., f_min_video_height + [o_detached_bottombar_view frame].size.height + [o_detached_titlebar_view frame].size.height )];
- }
- else if( b_video_deco )
- {
- [self setContentMinSize:NSMakeSize(604., 288.)];
- [o_detached_video_window setContentMinSize: NSMakeSize( 363., f_min_video_height + [o_detached_bottombar_view frame].size.height )];
- }
else
- { // !b_video_deco:
- if (b_dark_interface)
- [self setContentMinSize:NSMakeSize(604., 288. + [o_titlebar_view frame].size.height)];
- else
- [self setContentMinSize:NSMakeSize(604., 288.)];
-
- [o_detached_bottombar_view setHidden:YES];
- [o_detached_video_window setContentMinSize: NSMakeSize( f_min_video_height, f_min_video_height )];
- }
+ [self setContentMinSize:NSMakeSize(604., 288.)];
[self setTitle: _NS("VLC media player")];
- [o_time_fld setAlignment: NSCenterTextAlignment];
- [o_time_fld setNeedsDisplay:YES];
+
b_dropzone_active = YES;
- o_temp_view = [[NSView alloc] init];
- [o_temp_view setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
[o_dropzone_view setFrame: [o_playlist_table frame]];
[o_left_split_view setFrame: [o_sidebar_view frame]];
- if (b_nativeFullscreenMode)
- {
- NSRect frame;
- [self setCollectionBehavior: NSWindowCollectionBehaviorFullScreenPrimary];
- float f_width = [o_fullscreen_btn frame].size.width;
-
- #define moveItem( item ) \
- frame = [item frame]; \
- frame.origin.x = f_width + frame.origin.x; \
- [item setFrame: frame]
-
- moveItem( o_effects_btn );
- moveItem( o_volume_up_btn );
- moveItem( o_volume_sld );
- moveItem( o_volume_track_view );
- moveItem( o_volume_down_btn );
- moveItem( o_time_fld );
- #undef moveItem
-
- #define enlargeItem( item ) \
- frame = [item frame]; \
- frame.size.width = f_width + frame.size.width; \
- [item setFrame: frame]
-
- enlargeItem( o_time_sld );
- enlargeItem( o_progress_bar );
- enlargeItem( o_time_sld_background );
- enlargeItem( o_time_sld_fancygradient_view );
- #undef enlargeItem
-
- [o_fullscreen_btn removeFromSuperviewWithoutNeedingDisplay];
- }
- else
- {
- [o_titlebar_view setFullscreenButtonHidden: YES];
- if (b_video_deco)
- [o_detached_titlebar_view setFullscreenButtonHidden: YES];
- }
- if (OSX_LION)
- {
+ if (!OSX_SNOW_LEOPARD) {
/* the default small size of the search field is slightly different on Lion, let's work-around that */
NSRect frame;
frame = [o_search_fld frame];
/* SD subnodes, inspired by the Qt4 intf */
char **ppsz_longnames;
int *p_categories;
- char **ppsz_names = vlc_sd_GetNames( pl_Get( VLCIntf ), &ppsz_longnames, &p_categories );
+ char **ppsz_names = vlc_sd_GetNames(pl_Get(VLCIntf), &ppsz_longnames, &p_categories);
if (!ppsz_names)
- msg_Err( VLCIntf, "no sd item found" ); //TODO
+ msg_Err(VLCIntf, "no sd item found"); //TODO
char **ppsz_name = ppsz_names, **ppsz_longname = ppsz_longnames;
int *p_category = p_categories;
NSMutableArray *internetItems = [[NSMutableArray alloc] init];
NSMutableArray *lanItems = [[NSMutableArray alloc] init];
NSMutableArray *mycompItems = [[NSMutableArray alloc] init];
NSString *o_identifier;
- for (; *ppsz_name; ppsz_name++, ppsz_longname++, p_category++)
- {
+ for (; *ppsz_name; ppsz_name++, ppsz_longname++, p_category++) {
o_identifier = [NSString stringWithCString: *ppsz_name encoding: NSUTF8StringEncoding];
switch (*p_category) {
case SD_CAT_INTERNET:
- {
[internetItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
- if (!strncmp( *ppsz_name, "podcast", 7 ))
- [internetItems removeLastObject]; // we don't support podcasts at this point (see #6017)
-// [[internetItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-podcast"]];
+ if (!strncmp(*ppsz_name, "podcast", 7))
+ [[internetItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-podcast"]];
else
[[internetItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
[[internetItems lastObject] setSdtype: SD_CAT_INTERNET];
- [[internetItems lastObject] setUntranslatedTitle: [NSString stringWithUTF8String: *ppsz_longname]];
- }
+ [[internetItems lastObject] setUntranslatedTitle: @(*ppsz_longname)];
break;
case SD_CAT_DEVICES:
- {
[devicesItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
[[devicesItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
[[devicesItems lastObject] setSdtype: SD_CAT_DEVICES];
- [[devicesItems lastObject] setUntranslatedTitle: [NSString stringWithUTF8String: *ppsz_longname]];
- }
+ [[devicesItems lastObject] setUntranslatedTitle: @(*ppsz_longname)];
break;
case SD_CAT_LAN:
- {
[lanItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
[[lanItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-local"]];
[[lanItems lastObject] setSdtype: SD_CAT_LAN];
- [[lanItems lastObject] setUntranslatedTitle: [NSString stringWithUTF8String: *ppsz_longname]];
- }
+ [[lanItems lastObject] setUntranslatedTitle: @(*ppsz_longname)];
break;
case SD_CAT_MYCOMPUTER:
- {
[mycompItems addObject: [SideBarItem itemWithTitle: _NS(*ppsz_longname) identifier: o_identifier]];
- if (!strncmp( *ppsz_name, "video_dir", 9 ))
+ if (!strncmp(*ppsz_name, "video_dir", 9))
[[mycompItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-movie"]];
- else if (!strncmp( *ppsz_name, "audio_dir", 9 ))
+ else if (!strncmp(*ppsz_name, "audio_dir", 9))
[[mycompItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-music"]];
- else if (!strncmp( *ppsz_name, "picture_dir", 11 ))
+ else if (!strncmp(*ppsz_name, "picture_dir", 11))
[[mycompItems lastObject] setIcon: [NSImage imageNamed:@"sidebar-pictures"]];
else
[[mycompItems lastObject] setIcon: [NSImage imageNamed:@"NSApplicationIcon"]];
- [[mycompItems lastObject] setUntranslatedTitle: [NSString stringWithUTF8String: *ppsz_longname]];
+ [[mycompItems lastObject] setUntranslatedTitle: @(*ppsz_longname)];
[[mycompItems lastObject] setSdtype: SD_CAT_MYCOMPUTER];
- }
break;
default:
- msg_Warn( VLCIntf, "unknown SD type found, skipping (%s)", *ppsz_name );
+ msg_Warn(VLCIntf, "unknown SD type found, skipping (%s)", *ppsz_name);
break;
}
- free( *ppsz_name );
- free( *ppsz_longname );
+ free(*ppsz_name);
+ free(*ppsz_longname);
}
[mycompItem setChildren: [NSArray arrayWithArray: mycompItems]];
[devicesItem setChildren: [NSArray arrayWithArray: devicesItems]];
[devicesItems release];
[lanItems release];
[internetItems release];
- free( ppsz_names );
- free( ppsz_longnames );
- free( p_categories );
+ free(ppsz_names);
+ free(ppsz_longnames);
+ free(p_categories);
- [libraryItem setChildren: [NSArray arrayWithObjects: playlistItem, medialibraryItem, nil]];
+ [libraryItem setChildren: @[playlistItem, medialibraryItem]];
[o_sidebaritems addObject: libraryItem];
if ([mycompItem hasChildren])
[o_sidebaritems addObject: mycompItem];
[o_sidebar_view reloadData];
[o_sidebar_view selectRowIndexes:[NSIndexSet indexSetWithIndex:1] byExtendingSelection:NO];
[o_sidebar_view setDropItem:playlistItem dropChildIndex:NSOutlineViewDropOnItemIndex];
- [o_sidebar_view registerForDraggedTypes:[NSArray arrayWithObjects: NSFilenamesPboardType, @"VLCPlaylistItemPboardType", nil]];
+ [o_sidebar_view registerForDraggedTypes:@[NSFilenamesPboardType, @"VLCPlaylistItemPboardType"]];
[o_sidebar_view setAutosaveName:@"mainwindow-sidebar"];
[(PXSourceList *)o_sidebar_view setDataSource:self];
/* make sure we display the desired default appearance when VLC launches for the first time */
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
- if (![defaults objectForKey:@"VLCFirstRun"])
- {
+ if (![defaults objectForKey:@"VLCFirstRun"]) {
[defaults setObject:[NSDate date] forKey:@"VLCFirstRun"];
NSUInteger i_sidebaritem_count = [o_sidebaritems count];
for (NSUInteger x = 0; x < i_sidebaritem_count; x++)
- [o_sidebar_view expandItem: [o_sidebaritems objectAtIndex: x] expandChildren: YES];
+ [o_sidebar_view expandItem: [o_sidebaritems objectAtIndex:x] expandChildren: YES];
+
+ [o_fspanel center];
}
- if( b_dark_interface )
- {
+ if (b_dark_interface) {
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResizedOrMoved:) name: NSWindowDidResizeNotification object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(windowResizedOrMoved:) name: NSWindowDidMoveNotification object: nil];
NSRect winrect = [self frame];
CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
- [o_titlebar_view setFrame: NSMakeRect( 0, winrect.size.height - f_titleBarHeight,
- winrect.size.width, f_titleBarHeight )];
+ [o_titlebar_view setFrame: NSMakeRect(0, winrect.size.height - f_titleBarHeight,
+ winrect.size.width, f_titleBarHeight)];
[[self contentView] addSubview: o_titlebar_view positioned: NSWindowAbove relativeTo: o_split_view];
- if (winrect.size.height > 100)
- {
+ if (winrect.size.height > 100) {
[self setFrame: winrect display:YES animate:YES];
previousSavedFrame = winrect;
}
[o_split_view setFrame: winrect];
[o_video_view setFrame: winrect];
- /* detached video window */
- winrect = [o_detached_video_window frame];
- if (b_video_deco)
- {
- [o_detached_titlebar_view setFrame: NSMakeRect( 0, winrect.size.height - f_titleBarHeight, winrect.size.width, f_titleBarHeight )];
- [[o_detached_video_window contentView] addSubview: o_detached_titlebar_view positioned: NSWindowAbove relativeTo: nil];
- }
-
o_color_backdrop = [[VLCColorView alloc] initWithFrame: [o_split_view frame]];
[[self contentView] addSubview: o_color_backdrop positioned: NSWindowBelow relativeTo: o_split_view];
[o_color_backdrop setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
- }
- else
- {
- NSRect frame;
- frame = [o_time_sld_fancygradient_view frame];
- frame.size.height = frame.size.height - 1;
- frame.origin.y = frame.origin.y + 1;
- [o_time_sld_fancygradient_view setFrame: frame];
-
- frame = [o_detached_time_sld_fancygradient_view frame];
- frame.size.height = frame.size.height - 1;
- frame.origin.y = frame.origin.y + 1;
- [o_detached_time_sld_fancygradient_view setFrame: frame];
-
+ } else {
[o_video_view setFrame: [o_split_view frame]];
[o_playlist_table setBorderType: NSNoBorder];
[o_sidebar_scrollview setBorderType: NSNoBorder];
}
- NSRect frame;
- frame = [o_time_sld_fancygradient_view frame];
- frame.size.width = 0;
- [o_time_sld_fancygradient_view setFrame: frame];
-
- frame = [o_detached_time_sld_fancygradient_view frame];
- frame.size.width = 0;
- [o_detached_time_sld_fancygradient_view setFrame: frame];
-
- if (OSX_LION)
- {
- [o_resize_view setImage: NULL];
- [o_detached_resize_view setImage: NULL];
- }
-
- if ([self styleMask] & NSResizableWindowMask)
- {
- [o_resize_view removeFromSuperviewWithoutNeedingDisplay];
- [o_detached_resize_view removeFromSuperviewWithoutNeedingDisplay];
- }
-
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(someWindowWillClose:) name: NSWindowWillCloseNotification object: nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(someWindowWillMiniaturize:) name: NSWindowWillMiniaturizeNotification object:nil];
[[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(applicationWillTerminate:) name: NSApplicationWillTerminateNotification object: nil];
- [[VLCMain sharedInstance] playbackModeUpdated];
+ [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(mainSplitViewDidResizeSubviews:) name: NSSplitViewDidResizeSubviewsNotification object:o_split_view];
- [o_split_view setAutosaveName:@"10thanniversary-splitview"];
- if (b_splitviewShouldBeHidden)
- {
+ if (b_splitviewShouldBeHidden) {
[self hideSplitView];
i_lastSplitViewHeight = 300;
}
-}
-
-#pragma mark -
-#pragma mark interface customization
-- (void)toggleJumpButtons
-{
- b_show_jump_buttons = config_GetInt( VLCIntf, "macosx-show-playback-buttons" );
-
- if (b_show_jump_buttons)
- [self addJumpButtons];
- else
- [self removeJumpButtons];
-}
-
-- (void)addJumpButtons
-{
- NSRect preliminaryFrame = [o_bwd_btn frame];
- BOOL b_enabled = [o_bwd_btn isEnabled];
- preliminaryFrame.size.width = 26.;
- o_prev_btn = [[NSButton alloc] initWithFrame:preliminaryFrame];
- [o_prev_btn setButtonType: NSMomentaryChangeButton];
- [o_prev_btn setImage: [NSImage imageNamed:@"back-single"]];
- [o_prev_btn setAlternateImage: [NSImage imageNamed:@"back-pressed-single"]];
- [o_prev_btn setBezelStyle:NSRegularSquareBezelStyle];
- [o_prev_btn setBordered:NO];
- [o_prev_btn setTarget:self];
- [o_prev_btn setAction:@selector(prev:)];
- [o_prev_btn setToolTip: _NS("Previous")];
- [o_prev_btn setEnabled: b_enabled];
-
- o_next_btn = [[NSButton alloc] initWithFrame:preliminaryFrame];
- [o_next_btn setButtonType: NSMomentaryChangeButton];
- [o_next_btn setImage: [NSImage imageNamed:@"forward-single"]];
- [o_next_btn setAlternateImage: [NSImage imageNamed:@"forward-pressed-single"]];
- [o_next_btn setBezelStyle:NSRegularSquareBezelStyle];
- [o_next_btn setBordered:NO];
- [o_next_btn setTarget:self];
- [o_next_btn setAction:@selector(next:)];
- [o_next_btn setToolTip: _NS("Next")];
- [o_next_btn setEnabled: b_enabled];
-
- NSRect frame;
- float f_space = 32.;
- #define moveItem( item ) \
- frame = [item frame]; \
- frame.origin.x = frame.origin.x + f_space; \
- [[item animator] setFrame: frame]
-
- moveItem( o_bwd_btn );
- moveItem( o_play_btn );
- moveItem( o_fwd_btn );
- f_space = 62.;
- moveItem( o_stop_btn );
- moveItem( o_playlist_btn );
- moveItem( o_repeat_btn );
- moveItem( o_shuffle_btn );
- #undef moveItem
-
- #define resizeItem( item ) \
- frame = [item frame]; \
- frame.size.width = frame.size.width - f_space; \
- frame.origin.x = frame.origin.x + f_space; \
- [[item animator] setFrame: frame]
-
- resizeItem( o_time_sld );
- resizeItem( o_progress_bar );
- resizeItem( o_time_sld_background );
- resizeItem( o_time_sld_fancygradient_view );
- #undef resizeItem
-
- preliminaryFrame.origin.x = [o_next_btn frame].origin.x + 80. + [o_fwd_btn frame].size.width;
- [o_next_btn setFrame: preliminaryFrame];
-
- // wait until the animation is done
- [[self contentView] performSelector:@selector(addSubview:) withObject:o_prev_btn afterDelay:.2];
- [[self contentView] performSelector:@selector(addSubview:) withObject:o_next_btn afterDelay:.2];
-
- [o_fwd_btn setAction:@selector(forward:)];
- [o_bwd_btn setAction:@selector(backward:)];
-}
-
-- (void)removeJumpButtons
-{
- if (!o_prev_btn || !o_next_btn )
- return;
-
- [[o_prev_btn animator] setHidden: YES];
- [[o_next_btn animator] setHidden: YES];
- [o_prev_btn removeFromSuperviewWithoutNeedingDisplay];
- [o_next_btn removeFromSuperviewWithoutNeedingDisplay];
- [o_prev_btn release];
- [o_next_btn release];
-
- NSRect frame;
- float f_space = 32.;
- #define moveItem( item ) \
- frame = [item frame]; \
- frame.origin.x = frame.origin.x - f_space; \
- [[item animator] setFrame: frame]
-
- moveItem( o_bwd_btn );
- moveItem( o_play_btn );
- moveItem( o_fwd_btn );
- f_space = 62.;
- moveItem( o_stop_btn );
- moveItem( o_playlist_btn );
- moveItem( o_repeat_btn );
- moveItem( o_shuffle_btn );
- #undef moveItem
-
- #define resizeItem( item ) \
- frame = [item frame]; \
- frame.size.width = frame.size.width + f_space; \
- frame.origin.x = frame.origin.x - f_space; \
- [[item animator] setFrame: frame]
-
- resizeItem( o_time_sld );
- resizeItem( o_progress_bar );
- resizeItem( o_time_sld_background );
- resizeItem( o_time_sld_fancygradient_view );
- #undef resizeItem
-
- [o_bottombar_view setNeedsDisplay:YES];
-
- [o_fwd_btn setAction:@selector(fwd:)];
- [o_bwd_btn setAction:@selector(bwd:)];
-}
-
-- (void)togglePlaymodeButtons
-{
- b_show_playmode_buttons = config_GetInt( VLCIntf, "macosx-show-playmode-buttons" );
-
- if (b_show_playmode_buttons)
- [self addPlaymodeButtons];
- else
- [self removePlaymodeButtons];
-}
-
-- (void)addPlaymodeButtons
-{
- NSRect frame;
- float f_space = [o_repeat_btn frame].size.width + [o_shuffle_btn frame].size.width - 6.;
-
- // FIXME: switch o_playlist_btn artwork
-
- #define resizeItem( item ) \
- frame = [item frame]; \
- frame.size.width = frame.size.width - f_space; \
- frame.origin.x = frame.origin.x + f_space; \
- [[item animator] setFrame: frame]
-
- resizeItem( o_time_sld );
- resizeItem( o_progress_bar );
- resizeItem( o_time_sld_background );
- resizeItem( o_time_sld_fancygradient_view );
- #undef resizeItem
-
- [[o_repeat_btn animator] setHidden: NO];
- [[o_shuffle_btn animator] setHidden: NO];
-}
-
-- (void)removePlaymodeButtons
-{
- NSRect frame;
- float f_space = [o_repeat_btn frame].size.width + [o_shuffle_btn frame].size.width - 6.;
- [o_repeat_btn setHidden: YES];
- [o_shuffle_btn setHidden: YES];
-
- // FIXME: switch o_playlist_btn artwork
-
- #define resizeItem( item ) \
- frame = [item frame]; \
- frame.size.width = frame.size.width + f_space; \
- frame.origin.x = frame.origin.x - f_space; \
- [[item animator] setFrame: frame]
-
- resizeItem( o_time_sld );
- resizeItem( o_progress_bar );
- resizeItem( o_time_sld_background );
- resizeItem( o_time_sld_fancygradient_view );
- #undef resizeItem
-}
-
-#pragma mark -
-#pragma mark Button Actions
-
-- (IBAction)play:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] play];
-}
-
-- (void)resetPreviousButton
-{
- if (([NSDate timeIntervalSinceReferenceDate] - last_bwd_event) >= 0.35) {
- // seems like no further event occurred, so let's switch the playback item
- [[VLCCoreInteraction sharedInstance] previous];
- just_triggered_previous = NO;
- }
-}
-
-- (void)resetBackwardSkip
-{
- // the user stopped skipping, so let's allow him to change the item
- if (([NSDate timeIntervalSinceReferenceDate] - last_bwd_event) >= 0.35)
- just_triggered_previous = NO;
-}
-
-- (IBAction)prev:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] previous];
-}
-
-- (IBAction)bwd:(id)sender
-{
- if(!just_triggered_previous)
- {
- just_triggered_previous = YES;
- [self performSelector:@selector(resetPreviousButton)
- withObject: NULL
- afterDelay:0.40];
- }
- else
- {
- if (([NSDate timeIntervalSinceReferenceDate] - last_fwd_event) > 0.16 )
- {
- // we just skipped 4 "continous" events, otherwise we are too fast
- [[VLCCoreInteraction sharedInstance] backwardExtraShort];
- last_bwd_event = [NSDate timeIntervalSinceReferenceDate];
- [self performSelector:@selector(resetBackwardSkip)
- withObject: NULL
- afterDelay:0.40];
- }
- }
-}
-
-- (IBAction)backward:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] backwardShort];
-}
-- (void)resetNextButton
-{
- if (([NSDate timeIntervalSinceReferenceDate] - last_fwd_event) >= 0.35) {
- // seems like no further event occurred, so let's switch the playback item
- [[VLCCoreInteraction sharedInstance] next];
- just_triggered_next = NO;
+ /* sanity check for the window size */
+ NSRect frame = [self frame];
+ NSSize screenSize = [[self screen] frame].size;
+ if (screenSize.width <= frame.size.width || screenSize.height <= frame.size.height) {
+ nativeVideoSize = screenSize;
+ [self resizeWindow];
}
-}
-
-- (void)resetForwardSkip
-{
- // the user stopped skipping, so let's allow him to change the item
- if (([NSDate timeIntervalSinceReferenceDate] - last_fwd_event) >= 0.35)
- just_triggered_next = NO;
-}
-- (IBAction)next:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] next];
-}
+ /* update fs button to reflect state for next startup */
+ if (var_InheritBool(pl_Get(VLCIntf), "fullscreen"))
+ [o_controls_bar setFullscreenState:YES];
-- (IBAction)forward:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] forwardShort];
+ /* restore split view */
+ i_lastLeftSplitViewWidth = 200;
+ /* trick NSSplitView implementation, which pretends to know better than us */
+ if (!config_GetInt(VLCIntf, "macosx-show-sidebar"))
+ [self performSelector:@selector(toggleLeftSubSplitView) withObject:nil afterDelay:0.05];
}
-- (IBAction)fwd:(id)sender
-{
- if(!just_triggered_next)
- {
- just_triggered_next = YES;
- [self performSelector:@selector(resetNextButton)
- withObject: NULL
- afterDelay:0.40];
- }
- else
- {
- if (([NSDate timeIntervalSinceReferenceDate] - last_fwd_event) > 0.16 )
- {
- // we just skipped 4 "continous" events, otherwise we are too fast
- [[VLCCoreInteraction sharedInstance] forwardExtraShort];
- last_fwd_event = [NSDate timeIntervalSinceReferenceDate];
- [self performSelector:@selector(resetForwardSkip)
- withObject: NULL
- afterDelay:0.40];
- }
- }
-}
+#pragma mark -
+#pragma mark appearance management
-- (IBAction)stop:(id)sender
+- (VLCMainWindowControlsBar *)controlsBar;
{
- [[VLCCoreInteraction sharedInstance] stop];
+ return (VLCMainWindowControlsBar *)o_controls_bar;
}
- (void)resizePlaylistAfterCollapse
{
NSRect plrect;
- plrect = [[o_playlist_table animator] frame];
- plrect.size.height = i_lastSplitViewHeight - 19.0; // actual pl top bar height, which differs from its frame
+ plrect = [o_playlist_table frame];
+ plrect.size.height = i_lastSplitViewHeight - 20.0; // actual pl top bar height, which differs from its frame
[[o_playlist_table animator] setFrame: plrect];
NSRect rightSplitRect;
rightSplitRect = [o_right_split_view frame];
- plrect = [[o_dropzone_box animator] frame];
+ plrect = [o_dropzone_box frame];
plrect.origin.x = (rightSplitRect.size.width - plrect.size.width) / 2;
plrect.origin.y = (rightSplitRect.size.height - plrect.size.height) / 2;
[[o_dropzone_box animator] setFrame: plrect];
- (void)makeSplitViewVisible
{
- if( b_dark_interface )
- [self setContentMinSize: NSMakeSize( 604., 288. + [o_titlebar_view frame].size.height )];
+ if (b_dark_interface)
+ [self setContentMinSize: NSMakeSize(604., 288. + [o_titlebar_view frame].size.height)];
else
- [self setContentMinSize: NSMakeSize( 604., 288. )];
+ [self setContentMinSize: NSMakeSize(604., 288.)];
NSRect old_frame = [self frame];
float newHeight = [self minSize].height;
- if( old_frame.size.height < newHeight )
- {
+ if (old_frame.size.height < newHeight) {
NSRect new_frame = old_frame;
new_frame.origin.y = old_frame.origin.y + old_frame.size.height - newHeight;
new_frame.size.height = newHeight;
[o_video_view setHidden: YES];
[o_split_view setHidden: NO];
- [self makeFirstResponder: nil];
+ if ([self fullscreen]) {
+ [[o_controls_bar bottomBarView] setHidden: NO];
+ [o_fspanel setNonActive:nil];
+ }
+ [self makeFirstResponder: o_playlist_table];
}
- (void)makeSplitViewHidden
{
- if( b_dark_interface )
- [self setContentMinSize: NSMakeSize( 604., f_min_video_height + [o_titlebar_view frame].size.height )];
+ if (b_dark_interface)
+ [self setContentMinSize: NSMakeSize(604., f_min_video_height + [o_titlebar_view frame].size.height)];
else
- [self setContentMinSize: NSMakeSize( 604., f_min_video_height )];
+ [self setContentMinSize: NSMakeSize(604., f_min_video_height)];
[o_split_view setHidden: YES];
[o_video_view setHidden: NO];
+ if ([self fullscreen]) {
+ [[o_controls_bar bottomBarView] setHidden: YES];
+ [o_fspanel setActive:nil];
+ }
- if( [[o_video_view subviews] count] > 0 )
+ if ([[o_video_view subviews] count] > 0)
[self makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
}
+// only exception for an controls bar button action
- (IBAction)togglePlaylist:(id)sender
{
- if (![self isVisible] && sender != nil)
- {
+ if (![self isVisible] && sender != nil) {
[self makeKeyAndOrderFront: sender];
return;
}
BOOL b_activeVideo = [[VLCMain sharedInstance] activeVideoPlayback];
BOOL b_restored = NO;
- // TODO: implement toggle playlist in this situation (triggerd via menu item).
- // but for now we block this case, to avoid displaying only the half
- if( b_nativeFullscreenMode && b_fullscreen && b_activeVideo && sender != nil )
- return;
+ BOOL b_have_alt_key = ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0;
+ if (sender && [sender isKindOfClass: [NSMenuItem class]])
+ b_have_alt_key = NO;
- if (b_dropzone_active && ([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0)
- {
+ if (b_dropzone_active && b_have_alt_key) {
[self hideDropZone];
return;
}
- if ( !(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ( (([[NSApp currentEvent] modifierFlags] & NSAlternateKeyMask) != 0 && b_activeVideo)
- || (b_nonembedded && sender != nil)
- || (!b_activeVideo && sender != nil)
- || b_minimized_view ) )
- {
+ if (!(b_nativeFullscreenMode && b_fullscreen) && !b_splitview_removed && ((b_have_alt_key && b_activeVideo)
+ || (b_nonembedded && sender != nil)
+ || (!b_activeVideo && sender != nil)
+ || b_minimized_view))
[self hideSplitView];
- }
- else
- {
- if (b_splitview_removed)
- {
- if( !b_nonembedded || ( sender != nil && b_nonembedded))
+ else {
+ if (b_splitview_removed) {
+ if (!b_nonembedded || (sender != nil && b_nonembedded))
[self showSplitView];
if (sender == nil)
b_restored = YES;
}
- if (!b_nonembedded)
- {
- if (([o_video_view isHidden] && b_activeVideo) || b_restored || (b_activeVideo && sender == nil) )
+ if (!b_nonembedded) {
+ if (([o_video_view isHidden] && b_activeVideo) || b_restored || (b_activeVideo && sender == nil))
[self makeSplitViewHidden];
else
[self makeSplitViewVisible];
- }
- else
- {
+ } else {
[o_split_view setHidden: NO];
[o_playlist_table setHidden: NO];
- [o_video_view setHidden: !b_activeVideo];
- if( b_activeVideo && [[o_video_view subviews] count] > 0 )
- [[o_video_view window] makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
+ [o_video_view setHidden: YES];
}
}
}
-- (void)setRepeatOne
-{
- [o_repeat_btn setImage: o_repeat_one_img];
- [o_repeat_btn setAlternateImage: o_repeat_one_pressed_img];
-}
-
-- (void)setRepeatAll
+- (IBAction)dropzoneButtonAction:(id)sender
{
- [o_repeat_btn setImage: o_repeat_all_img];
- [o_repeat_btn setAlternateImage: o_repeat_all_pressed_img];
+ [[[VLCMain sharedInstance] open] openFileGeneric];
}
-- (void)setRepeatOff
-{
- [o_repeat_btn setImage: o_repeat_img];
- [o_repeat_btn setAlternateImage: o_repeat_pressed_img];
-}
+#pragma mark -
+#pragma mark overwritten default functionality
-- (IBAction)repeat:(id)sender
+- (void)windowResizedOrMoved:(NSNotification *)notification
{
- vlc_value_t looping,repeating;
- intf_thread_t * p_intf = VLCIntf;
- playlist_t * p_playlist = pl_Get( p_intf );
-
- var_Get( p_playlist, "repeat", &repeating );
- var_Get( p_playlist, "loop", &looping );
-
- if( !repeating.b_bool && !looping.b_bool )
- {
- /* was: no repeating at all, switching to Repeat One */
- [[VLCCoreInteraction sharedInstance] repeatOne];
- [self setRepeatOne];
- }
- else if( repeating.b_bool && !looping.b_bool )
- {
- /* was: Repeat One, switching to Repeat All */
- [[VLCCoreInteraction sharedInstance] repeatAll];
- [self setRepeatAll];
- }
- else
- {
- /* was: Repeat All or bug in VLC, switching to Repeat Off */
- [[VLCCoreInteraction sharedInstance] repeatOff];
- [self setRepeatOff];
- }
+ [self saveFrameUsingName: [self frameAutosaveName]];
}
-- (void)setShuffle
+- (void)applicationWillTerminate:(NSNotification *)notification
{
- bool b_value;
- playlist_t *p_playlist = pl_Get( VLCIntf );
- b_value = var_GetBool( p_playlist, "random" );
+ config_PutInt(VLCIntf, "macosx-show-sidebar", ![o_split_view isSubviewCollapsed:o_left_split_view]);
- if(b_value) {
- [o_shuffle_btn setImage: o_shuffle_on_img];
- [o_shuffle_btn setAlternateImage: o_shuffle_on_pressed_img];
- }
- else
- {
- [o_shuffle_btn setImage: o_shuffle_img];
- [o_shuffle_btn setAlternateImage: o_shuffle_pressed_img];
- }
+ [self saveFrameUsingName: [self frameAutosaveName]];
}
-- (IBAction)shuffle:(id)sender
-{
- [[VLCCoreInteraction sharedInstance] shuffle];
- [self setShuffle];
-}
-- (IBAction)timeSliderAction:(id)sender
+- (void)someWindowWillClose:(NSNotification *)notification
{
- float f_updated;
- input_thread_t * p_input;
+ id obj = [notification object];
- switch( [[NSApp currentEvent] type] )
- {
- case NSLeftMouseUp:
- case NSLeftMouseDown:
- case NSLeftMouseDragged:
- f_updated = [sender floatValue];
- break;
-
- default:
- return;
- }
- p_input = pl_CurrentInput( VLCIntf );
- if( p_input != NULL )
- {
- vlc_value_t pos;
- NSString * o_time;
-
- pos.f_float = f_updated / 10000.;
- var_Set( p_input, "position", pos );
- [o_time_sld setFloatValue: f_updated];
-
- o_time = [self getCurrentTimeAsString: p_input];
- [o_time_fld setStringValue: o_time];
- [o_fspanel setStreamPos: f_updated andTime: o_time];
- vlc_object_release( p_input );
+ // hasActiveVideo is defined for VLCVideoWindowCommon and subclasses
+ if ([obj respondsToSelector:@selector(hasActiveVideo)] && [obj hasActiveVideo]) {
+ if ([[VLCMain sharedInstance] activeVideoPlayback])
+ [[VLCCoreInteraction sharedInstance] stop];
}
}
-- (IBAction)volumeAction:(id)sender
+- (void)someWindowWillMiniaturize:(NSNotification *)notification
{
- if (sender == o_volume_sld)
- [[VLCCoreInteraction sharedInstance] setVolume: [sender intValue]];
- else if (sender == o_volume_down_btn)
- {
- [[VLCCoreInteraction sharedInstance] mute];
+ if (config_GetInt(VLCIntf, "macosx-pause-minimized")) {
+ id obj = [notification object];
+
+ if ([obj class] == [VLCVideoWindowCommon class] || [obj class] == [VLCDetachedVideoWindow class] || ([obj class] == [VLCMainWindow class] && !b_nonembedded)) {
+ if ([[VLCMain sharedInstance] activeVideoPlayback])
+ [[VLCCoreInteraction sharedInstance] pause];
+ }
}
- else
- [[VLCCoreInteraction sharedInstance] setVolume: AOUT_VOLUME_MAX];
}
-- (IBAction)effects:(id)sender
+#pragma mark -
+#pragma mark Update interface and respond to foreign events
+- (void)showDropZone
{
- [[VLCMainMenu sharedInstance] showAudioEffects: sender];
+ b_dropzone_active = YES;
+ [o_right_split_view addSubview: o_dropzone_view positioned:NSWindowAbove relativeTo:o_playlist_table];
+ [o_dropzone_view setFrame: [o_playlist_table frame]];
+ [[o_playlist_table animator] setHidden:YES];
}
-- (IBAction)fullscreen:(id)sender
+- (void)hideDropZone
{
- [[VLCCoreInteraction sharedInstance] toggleFullscreen];
+ b_dropzone_active = NO;
+ [o_dropzone_view removeFromSuperview];
+ [[o_playlist_table animator] setHidden: NO];
}
-- (IBAction)dropzoneButtonAction:(id)sender
+- (void)hideSplitView
{
- [[[VLCMain sharedInstance] open] openFileGeneric];
-}
+ NSRect winrect = [self frame];
+ i_lastSplitViewHeight = [o_split_view frame].size.height;
+ winrect.size.height = winrect.size.height - i_lastSplitViewHeight;
+ winrect.origin.y = winrect.origin.y + i_lastSplitViewHeight;
+ [self setFrame: winrect display: YES animate: YES];
+ [self performSelector:@selector(hideDropZone) withObject:nil afterDelay:0.1];
+ if (b_dark_interface) {
+ [self setContentMinSize: NSMakeSize(604., [o_controls_bar height] + [o_titlebar_view frame].size.height)];
+ [self setContentMaxSize: NSMakeSize(FLT_MAX, [o_controls_bar height] + [o_titlebar_view frame].size.height)];
+ } else {
+ [self setContentMinSize: NSMakeSize(604., [o_controls_bar height])];
+ [self setContentMaxSize: NSMakeSize(FLT_MAX, [o_controls_bar height])];
+ }
-#pragma mark -
-#pragma mark overwritten default functionality
-- (BOOL)canBecomeKeyWindow
-{
- return YES;
+ b_splitview_removed = YES;
}
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
+- (void)showSplitView
{
- SEL s_menuAction = [menuItem action];
+ [self updateWindow];
+ if (b_dark_interface)
+ [self setContentMinSize:NSMakeSize(604., 288. + [o_titlebar_view frame].size.height)];
+ else
+ [self setContentMinSize:NSMakeSize(604., 288.)];
+ [self setContentMaxSize: NSMakeSize(FLT_MAX, FLT_MAX)];
- if ((s_menuAction == @selector(performClose:)) || (s_menuAction == @selector(performMiniaturize:)) || (s_menuAction == @selector(performZoom:)))
- return YES;
+ NSRect winrect;
+ winrect = [self frame];
+ winrect.size.height = winrect.size.height + i_lastSplitViewHeight;
+ winrect.origin.y = winrect.origin.y - i_lastSplitViewHeight;
+ [self setFrame: winrect display: YES animate: YES];
- return [super validateMenuItem:menuItem];
-}
+ [self performSelector:@selector(resizePlaylistAfterCollapse) withObject: nil afterDelay:0.75];
-- (void)setTitle:(NSString *)title
-{
- if (b_dark_interface)
- {
- [o_titlebar_view setWindowTitle: title];
- if (b_video_deco)
- [o_detached_titlebar_view setWindowTitle: title];
- }
- if (b_nonembedded && [[VLCMain sharedInstance] activeVideoPlayback])
- [o_detached_video_window setTitle: title];
- [super setTitle: title];
+ b_splitview_removed = NO;
}
-- (void)performClose:(id)sender
+- (void)updateTimeSlider
{
- NSWindow *o_key_window = [NSApp keyWindow];
-
- if (b_dark_interface || !b_video_deco)
- {
- [o_key_window orderOut: sender];
- if ( [[VLCMain sharedInstance] activeVideoPlayback] && ( !b_nonembedded || o_key_window != self ))
- [[VLCCoreInteraction sharedInstance] stop];
- }
- else
- {
- if( b_nonembedded && o_key_window != self )
- [o_detached_video_window performClose: sender];
- else
- [super performClose: sender];
- }
-}
+ [o_controls_bar updateTimeSlider];
+ [o_fspanel updatePositionAndTime];
-- (void)performMiniaturize:(id)sender
-{
- if (b_dark_interface)
- [self miniaturize: sender];
- else
- [super performMiniaturize: sender];
+ [[[VLCMain sharedInstance] voutController] updateWindowsControlsBarWithSelector:@selector(updateTimeSlider)];
}
-- (void)performZoom:(id)sender
+- (void)updateName
{
- if (b_dark_interface)
- [self customZoom: sender];
- else
- [super performZoom: sender];
-}
+ input_thread_t * p_input;
+ p_input = pl_CurrentInput(VLCIntf);
+ if (p_input) {
+ NSString *aString;
-- (void)zoom:(id)sender
-{
- if (b_dark_interface)
- [self customZoom: sender];
- else
- [super zoom: sender];
-}
+ if (!config_GetPsz(VLCIntf, "video-title")) {
+ char *format = var_InheritString(VLCIntf, "input-title-format");
+ char *formated = str_format_meta(pl_Get(VLCIntf), format);
+ free(format);
+ aString = @(formated);
+ free(formated);
+ } else
+ aString = @(config_GetPsz(VLCIntf, "video-title"));
-/**
- * Given a proposed frame rectangle, return a modified version
- * which will fit inside the screen.
- *
- * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
- * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
- * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
- * Copyright (C) 1996 Free Software Foundation, Inc.
- */
-- (NSRect) customConstrainFrameRect: (NSRect)frameRect toScreen: (NSScreen*)screen
-{
- NSRect screenRect = [screen visibleFrame];
- float difference;
-
- /* Move top edge of the window inside the screen */
- difference = NSMaxY (frameRect) - NSMaxY (screenRect);
- if (difference > 0)
- {
- frameRect.origin.y -= difference;
- }
+ char *uri = input_item_GetURI(input_GetItem(p_input));
- /* If the window is resizable, resize it (if needed) so that the
- bottom edge is on the screen or can be on the screen when the user moves
- the window */
- difference = NSMaxY (screenRect) - NSMaxY (frameRect);
- if (_styleMask & NSResizableWindowMask)
- {
- float difference2;
-
- difference2 = screenRect.origin.y - frameRect.origin.y;
- difference2 -= difference;
- // Take in account the space between the top of window and the top of the
- // screen which can be used to move the bottom of the window on the screen
- if (difference2 > 0)
- {
- frameRect.size.height -= difference2;
- frameRect.origin.y += difference2;
+ NSURL * o_url = [NSURL URLWithString: @(uri)];
+ if ([o_url isFileURL]) {
+ [self setRepresentedURL: o_url];
+ [[[VLCMain sharedInstance] voutController] updateWindowsUsingBlock:^(VLCVideoWindowCommon *o_window) {
+ [o_window setRepresentedURL:o_url];
+ }];
+ } else {
+ [self setRepresentedURL: nil];
+ [[[VLCMain sharedInstance] voutController] updateWindowsUsingBlock:^(VLCVideoWindowCommon *o_window) {
+ [o_window setRepresentedURL:nil];
+ }];
}
+ free(uri);
- /* Ensure that resizing doesn't makewindow smaller than minimum */
- difference2 = [self minSize].height - frameRect.size.height;
- if (difference2 > 0)
- {
- frameRect.size.height += difference2;
- frameRect.origin.y -= difference2;
+ if ([aString isEqualToString:@""]) {
+ if ([o_url isFileURL])
+ aString = [[NSFileManager defaultManager] displayNameAtPath: [o_url path]];
+ else
+ aString = [o_url absoluteString];
}
- }
- return frameRect;
-}
+ if ([aString length] > 0) {
+ [self setTitle: aString];
+ [[[VLCMain sharedInstance] voutController] updateWindowsUsingBlock:^(VLCVideoWindowCommon *o_window) {
+ [o_window setTitle:aString];
+ }];
-#define DIST 3
+ [o_fspanel setStreamTitle: aString];
+ } else {
+ [self setTitle: _NS("VLC media player")];
+ [self setRepresentedURL: nil];
+ }
-/**
- Zooms the receiver. This method calls the delegate method
- windowShouldZoom:toFrame: to determine if the window should
- be allowed to zoom to full screen.
- *
- * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
- * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
- * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
- * Copyright (C) 1996 Free Software Foundation, Inc.
- */
-- (void)customZoom:(id)sender
-{
- NSRect maxRect = [[self screen] visibleFrame];
- NSRect currentFrame = [self frame];
-
- if ([[self delegate] respondsToSelector: @selector(windowWillUseStandardFrame:defaultFrame:)])
- {
- maxRect = [[self delegate] windowWillUseStandardFrame: self defaultFrame: maxRect];
- }
-
- maxRect = [self customConstrainFrameRect: maxRect toScreen: [self screen]];
-
- // Compare the new frame with the current one
- if ((abs(NSMaxX(maxRect) - NSMaxX(currentFrame)) < DIST)
- && (abs(NSMaxY(maxRect) - NSMaxY(currentFrame)) < DIST)
- && (abs(NSMinX(maxRect) - NSMinX(currentFrame)) < DIST)
- && (abs(NSMinY(maxRect) - NSMinY(currentFrame)) < DIST))
- {
- // Already in zoomed mode, reset user frame, if stored
- if ([self frameAutosaveName] != nil)
- {
- [self setFrame: previousSavedFrame display: YES animate: YES];
- [self saveFrameUsingName: [self frameAutosaveName]];
- }
- return;
- }
-
- if ([self frameAutosaveName] != nil)
- {
- [self saveFrameUsingName: [self frameAutosaveName]];
- previousSavedFrame = [self frame];
- }
-
- [self setFrame: maxRect display: YES animate: YES];
-}
-
-- (void)windowResizedOrMoved:(NSNotification *)notification
-{
- [self saveFrameUsingName: [self frameAutosaveName]];
-}
-
-- (void)applicationWillTerminate:(NSNotification *)notification
-{
- [self saveFrameUsingName: [self frameAutosaveName]];
-}
-
-- (void)someWindowWillClose:(NSNotification *)notification
-{
- if([notification object] == o_detached_video_window || ([notification object] == self && !b_nonembedded))
- {
- if ([[VLCMain sharedInstance] activeVideoPlayback])
- [[VLCCoreInteraction sharedInstance] stop];
- }
-}
-
-- (void)someWindowWillMiniaturize:(NSNotification *)notification
-{
- if (config_GetInt( VLCIntf, "macosx-pause-minimized" ))
- {
- if([notification object] == o_detached_video_window || ([notification object] == self && !b_nonembedded))
- {
- if([[VLCMain sharedInstance] activeVideoPlayback])
- [[VLCCoreInteraction sharedInstance] pause];
- }
- }
-}
-
-- (NSSize)windowWillResize:(NSWindow *)window toSize:(NSSize)proposedFrameSize
-{
- id videoWindow = [o_video_view window];
- if (![[VLCMain sharedInstance] activeVideoPlayback] || nativeVideoSize.width == 0. || nativeVideoSize.height == 0. || window != videoWindow)
- return proposedFrameSize;
-
- // needed when entering lion fullscreen mode
- if( b_fullscreen )
- return proposedFrameSize;
-
- if( [[VLCCoreInteraction sharedInstance] aspectRatioIsLocked] )
- {
- NSRect videoWindowFrame = [videoWindow frame];
- NSRect viewRect = [o_video_view convertRect:[o_video_view bounds] toView: nil];
- NSRect contentRect = [videoWindow contentRectForFrameRect:videoWindowFrame];
- float marginy = viewRect.origin.y + videoWindowFrame.size.height - contentRect.size.height;
- float marginx = contentRect.size.width - viewRect.size.width;
- if( b_dark_interface && b_video_deco )
- marginy += [o_titlebar_view frame].size.height;
-
- proposedFrameSize.height = (proposedFrameSize.width - marginx) * nativeVideoSize.height / nativeVideoSize.width + marginy;
- }
-
- return proposedFrameSize;
-}
-
-#pragma mark -
-#pragma mark Update interface and respond to foreign events
-- (void)showDropZone
-{
- b_dropzone_active = YES;
- [o_right_split_view addSubview: o_dropzone_view];
- [o_dropzone_view setFrame: [o_playlist_table frame]];
- [[o_playlist_table animator] setHidden:YES];
-}
-
-- (void)hideDropZone
-{
- b_dropzone_active = NO;
- [o_dropzone_view removeFromSuperview];
- [[o_playlist_table animator] setHidden: NO];
-}
-
-- (void)hideSplitView
-{
- NSRect winrect = [self frame];
- i_lastSplitViewHeight = [o_split_view frame].size.height;
- winrect.size.height = winrect.size.height - i_lastSplitViewHeight;
- winrect.origin.y = winrect.origin.y + i_lastSplitViewHeight;
- [self setFrame: winrect display: YES animate: YES];
- [self performSelector:@selector(hideDropZone) withObject:nil afterDelay:0.1];
- if (b_dark_interface)
- {
- [self setContentMinSize: NSMakeSize( 604., [o_bottombar_view frame].size.height + [o_titlebar_view frame].size.height )];
- [self setContentMaxSize: NSMakeSize( FLT_MAX, [o_bottombar_view frame].size.height + [o_titlebar_view frame].size.height )];
- }
- else
- {
- [self setContentMinSize: NSMakeSize( 604., [o_bottombar_view frame].size.height )];
- [self setContentMaxSize: NSMakeSize( FLT_MAX, [o_bottombar_view frame].size.height )];
- }
-
- b_splitview_removed = YES;
-}
-
-- (void)showSplitView
-{
- [self updateWindow];
- if (b_dark_interface)
- [self setContentMinSize:NSMakeSize( 604., 288. + [o_titlebar_view frame].size.height )];
- else
- [self setContentMinSize:NSMakeSize( 604., 288. )];
- [self setContentMaxSize: NSMakeSize( FLT_MAX, FLT_MAX )];
-
- NSRect winrect;
- winrect = [self frame];
- winrect.size.height = winrect.size.height + i_lastSplitViewHeight;
- winrect.origin.y = winrect.origin.y - i_lastSplitViewHeight;
- [self setFrame: winrect display: YES animate: YES];
-
- [self performSelector:@selector(resizePlaylistAfterCollapse) withObject: nil afterDelay:0.75];
-
- b_splitview_removed = NO;
-}
-
-- (NSString *)getCurrentTimeAsString:(input_thread_t *)p_input
-{
- assert( p_input != nil );
-
- vlc_value_t time;
- char psz_time[MSTRTIME_MAX_SIZE];
-
- var_Get( p_input, "time", &time );
-
- mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) );
- if( [o_time_fld timeRemaining] && dur > 0 )
- {
- mtime_t remaining = 0;
- if( dur > time.i_time )
- remaining = dur - time.i_time;
- return [NSString stringWithFormat: @"-%s", secstotimestr( psz_time, ( remaining / 1000000 ) )];
- }
- else
- return [NSString stringWithUTF8String: secstotimestr( psz_time, ( time.i_time / 1000000 ) )];
-}
-
-- (void)updateTimeSlider
-{
- input_thread_t * p_input;
- p_input = pl_CurrentInput( VLCIntf );
- if( p_input )
- {
- NSString * o_time;
- vlc_value_t pos;
- float f_updated;
-
- var_Get( p_input, "position", &pos );
- f_updated = 10000. * pos.f_float;
- [o_time_sld setFloatValue: f_updated];
-
- o_time = [self getCurrentTimeAsString: p_input];
-
- mtime_t dur = input_item_GetDuration( input_GetItem( p_input ) );
- if (dur == -1) {
- [o_time_sld setEnabled: NO];
- [o_time_sld setHidden: YES];
- [o_time_sld_fancygradient_view setHidden: YES];
- } else {
- [o_time_sld setEnabled: YES];
- [o_time_sld setHidden: NO];
- [o_time_sld_fancygradient_view setHidden: NO];
- }
-
- [o_time_fld setStringValue: o_time];
- [o_time_fld setNeedsDisplay:YES];
- [o_fspanel setStreamPos: f_updated andTime: o_time];
- vlc_object_release( p_input );
- }
- else
- {
- [o_time_sld setFloatValue: 0.0];
- [o_time_fld setStringValue: @"00:00"];
- [o_time_sld setEnabled: NO];
- [o_time_sld setHidden: YES];
- [o_time_sld_fancygradient_view setHidden: YES];
- if (b_video_deco)
- [o_detached_time_sld_fancygradient_view setHidden: YES];
- }
-
- if (b_video_deco)
- {
- [o_detached_time_sld setFloatValue: [o_time_sld floatValue]];
- [o_detached_time_sld setEnabled: [o_time_sld isEnabled]];
- [o_detached_time_fld setStringValue: [o_time_fld stringValue]];
- [o_detached_time_sld setHidden: [o_time_sld isHidden]];
- }
-}
-
-- (void)updateVolumeSlider
-{
- playlist_t * p_playlist = pl_Get( VLCIntf );
- int i_volume = lroundf(aout_VolumeGet( p_playlist ) * AOUT_VOLUME_DEFAULT);
- BOOL b_muted = [[VLCCoreInteraction sharedInstance] isMuted];
-
- if( !b_muted )
- {
- [o_volume_sld setIntValue: i_volume];
- [o_fspanel setVolumeLevel: i_volume];
- }
- else
- [o_volume_sld setIntValue: 0];
-
- [o_volume_sld setEnabled: !b_muted];
- [o_volume_up_btn setEnabled: !b_muted];
-}
-
-- (void)updateName
-{
- NSAutoreleasePool *o_pool = [[NSAutoreleasePool alloc] init];
- input_thread_t * p_input;
- p_input = pl_CurrentInput( VLCIntf );
- if( p_input )
- {
- NSString *aString;
- char *format = var_InheritString( VLCIntf, "input-title-format" );
- char *formated = str_format_meta( p_input, format );
- free( format );
- aString = [NSString stringWithUTF8String:formated];
- free( formated );
-
- char *uri = input_item_GetURI( input_GetItem( p_input ) );
-
- NSURL * o_url = [NSURL URLWithString: [NSString stringWithUTF8String: uri]];
- if ([o_url isFileURL])
- {
- [self setRepresentedURL: o_url];
- [o_detached_video_window setRepresentedURL: o_url];
- } else {
- [self setRepresentedURL: nil];
- [o_detached_video_window setRepresentedURL: nil];
- }
- free( uri );
-
- if ([aString isEqualToString:@""])
- {
- if ([o_url isFileURL])
- aString = [[NSFileManager defaultManager] displayNameAtPath: [o_url path]];
- else
- aString = [o_url absoluteString];
- }
-
- [self setTitle: aString];
- [o_fspanel setStreamTitle: aString];
- vlc_object_release( p_input );
- }
- else
- {
- [self setTitle: _NS("VLC media player")];
- [self setRepresentedURL: nil];
- }
-
- [o_pool release];
-}
-
-- (void)updateWindow
-{
- 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_Get( VLCIntf );
-
- PL_LOCK;
- b_plmul = playlist_CurrentSize( p_playlist ) > 1;
- PL_UNLOCK;
-
- input_thread_t * p_input = playlist_CurrentInput( p_playlist );
-
- bool b_buffering = NO;
-
- if( ( b_input = ( p_input != NULL ) ) )
- {
- /* seekable streams */
- cachedInputState = input_GetState( p_input );
- if ( cachedInputState == INIT_S || cachedInputState == OPENING_S )
- b_buffering = YES;
-
- /* seekable streams */
- b_seekable = var_GetBool( p_input, "can-seek" );
-
- /* check whether slow/fast motion is possible */
- b_control = var_GetBool( p_input, "can-rate" );
-
- /* chapters & titles */
- //FIXME! b_chapters = p_input->stream.i_area_nb > 1;
-
- vlc_object_release( p_input );
- }
-
- if( b_buffering )
- {
- [o_progress_bar startAnimation:self];
- [o_progress_bar setIndeterminate:YES];
- [o_progress_bar setHidden:NO];
- } else {
- [o_progress_bar stopAnimation:self];
- [o_progress_bar setHidden:YES];
- }
-
- [o_stop_btn setEnabled: b_input];
- [o_fwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- [o_bwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- if (b_show_jump_buttons)
- {
- [o_prev_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- [o_next_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- }
- if (b_video_deco)
- {
- [o_detached_fwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- [o_detached_bwd_btn setEnabled: (b_seekable || b_plmul || b_chapters)];
- }
- [[VLCMainMenu sharedInstance] setRateControlsEnabled: b_control];
-
- [o_time_sld setEnabled: b_seekable];
- [self updateTimeSlider];
- [o_fspanel setSeekable: b_seekable];
-
- PL_LOCK;
- if ([[[VLCMain sharedInstance] playlist] currentPlaylistRoot] != p_playlist->p_local_category || p_playlist->p_local_category->i_children > 0)
- [self hideDropZone];
- else
- [self showDropZone];
- PL_UNLOCK;
- [o_sidebar_view setNeedsDisplay:YES];
-}
-
-- (void)setPause
-{
- [o_play_btn setImage: o_pause_img];
- [o_play_btn setAlternateImage: o_pause_pressed_img];
- [o_play_btn setToolTip: _NS("Pause")];
- if (b_video_deco)
- {
- [o_detached_play_btn setImage: o_pause_img];
- [o_detached_play_btn setAlternateImage: o_pause_pressed_img];
- [o_detached_play_btn setToolTip: _NS("Pause")];
- }
- [o_fspanel setPause];
-}
-
-- (void)setPlay
-{
- [o_play_btn setImage: o_play_img];
- [o_play_btn setAlternateImage: o_play_pressed_img];
- [o_play_btn setToolTip: _NS("Play")];
- if (b_video_deco)
- {
- [o_detached_play_btn setImage: o_play_img];
- [o_detached_play_btn setAlternateImage: o_play_pressed_img];
- [o_detached_play_btn setToolTip: _NS("Play")];
- }
- [o_fspanel setPlay];
-}
-
-- (void)drawFancyGradientEffectForTimeSlider
-{
- if (OSX_LEOPARD)
- return;
-
- NSAutoreleasePool * o_pool = [[NSAutoreleasePool alloc] init];
- CGFloat f_value = [o_time_sld knobPosition];
- if (f_value > 7.5)
- {
- NSRect oldFrame = [o_time_sld_fancygradient_view frame];
- if (f_value != oldFrame.size.width)
- {
- if ([o_time_sld_fancygradient_view isHidden])
- [o_time_sld_fancygradient_view setHidden: NO];
- [o_time_sld_fancygradient_view setFrame: NSMakeRect( oldFrame.origin.x, oldFrame.origin.y, f_value, oldFrame.size.height )];
- }
-
- if (b_nonembedded && b_video_deco)
- {
- f_value = [o_detached_time_sld knobPosition];
- oldFrame = [o_detached_time_sld_fancygradient_view frame];
- if (f_value != oldFrame.size.width)
- {
- if ([o_detached_time_sld_fancygradient_view isHidden])
- [o_detached_time_sld_fancygradient_view setHidden: NO];
- [o_detached_time_sld_fancygradient_view setFrame: NSMakeRect( oldFrame.origin.x, oldFrame.origin.y, f_value, oldFrame.size.height )];
- }
- }
- }
- else
- {
- NSRect frame;
- frame = [o_time_sld_fancygradient_view frame];
- if (frame.size.width > 0)
- {
- frame.size.width = 0;
- [o_time_sld_fancygradient_view setFrame: frame];
-
- if (b_video_deco)
- {
- frame = [o_detached_time_sld_fancygradient_view frame];
- frame.size.width = 0;
- [o_detached_time_sld_fancygradient_view setFrame: frame];
- }
- }
- [o_time_sld_fancygradient_view setHidden: YES];
- if (b_video_deco)
- [o_detached_time_sld_fancygradient_view setHidden: YES];
- }
- [o_pool release];
-}
-
-#pragma mark -
-#pragma mark Video Output handling
-- (id)videoView
-{
- return o_video_view;
-}
-
-- (id)setupVideoView
-{
- // TODO: make lion fullscreen compatible with macosx-background and !embedded-video
- if( config_GetInt( VLCIntf, "macosx-background" ) && !b_nativeFullscreenMode )
- {
- msg_Dbg( VLCIntf, "Creating background window" );
- NSScreen *screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)config_GetInt( VLCIntf, "macosx-vdev" )];
- if( !screen )
- screen = [self screen];
- NSRect screen_rect = [screen frame];
-
- if( o_extra_video_window )
- [o_extra_video_window release];
-
- o_extra_video_window = [[VLCWindow alloc] initWithContentRect:screen_rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO];
- [o_extra_video_window setLevel: CGWindowLevelForKey(kCGDesktopWindowLevelKey) + 1];
- [o_extra_video_window setBackgroundColor: [NSColor blackColor]];
- [o_extra_video_window setCanBecomeKeyWindow: NO];
- [o_extra_video_window setCanBecomeMainWindow: NO];
- [o_extra_video_window useOptimizedDrawing: YES];
- [o_extra_video_window setMovableByWindowBackground: NO];
-
- [o_video_view retain];
- if ([o_video_view superview] != NULL)
- [o_video_view removeFromSuperviewWithoutNeedingDisplay];
- screen_rect.origin.x = screen_rect.origin.y = 0;
- [o_video_view setFrame: screen_rect];
- [[o_extra_video_window contentView] addSubview: o_video_view positioned:NSWindowAbove relativeTo:nil];
- [o_video_view release];
-
- [o_extra_video_window orderBack:nil];
-
- b_nonembedded = YES;
- }
- else
- {
- if ((config_GetInt( VLCIntf, "embedded-video" ) || b_nativeFullscreenMode) && b_video_deco)
- {
- if ([o_video_view window] != self)
- {
- [o_video_view removeFromSuperviewWithoutNeedingDisplay];
- [o_video_view setFrame: [o_split_view frame]];
- [[self contentView] addSubview:o_video_view positioned:NSWindowAbove relativeTo:nil];
- }
- b_nonembedded = NO;
- }
- else
- {
- if ([o_video_view superview] != NULL)
- [o_video_view removeFromSuperviewWithoutNeedingDisplay];
-
- NSRect videoFrame;
- videoFrame.size = [[o_detached_video_window contentView] frame].size;
- if (b_video_deco)
- {
- videoFrame.size.height -= [o_detached_bottombar_view frame].size.height;
- if( b_dark_interface )
- videoFrame.size.height -= [o_detached_titlebar_view frame].size.height;
-
- videoFrame.origin.x = .0;
- videoFrame.origin.y = [o_detached_bottombar_view frame].size.height;
- }
- else
- {
- videoFrame.origin.y = .0;
- videoFrame.origin.x = .0;
- }
-
- [o_video_view setFrame: videoFrame];
- [[o_detached_video_window contentView] addSubview: o_video_view positioned:NSWindowAbove relativeTo:nil];
- [o_detached_video_window setLevel:NSNormalWindowLevel];
- [o_detached_video_window useOptimizedDrawing: YES];
- b_nonembedded = YES;
- }
-
- [[o_video_view window] makeKeyAndOrderFront: self];
-
- vout_thread_t *p_vout = getVout();
- if (p_vout)
- {
- if( var_GetBool( p_vout, "video-on-top" ) )
- [[o_video_view window] setLevel: NSStatusWindowLevel];
- else
- [[o_video_view window] setLevel: NSNormalWindowLevel];
- vlc_object_release( p_vout );
- }
- }
-
- [[o_video_view window] setAlphaValue: config_GetFloat( VLCIntf, "macosx-opaqueness" )];
- return o_video_view;
-}
-
-- (void)setVideoplayEnabled
-{
- BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback];
-
- if( b_videoPlayback )
- {
- // look for 'start at fullscreen'
- [[VLCMain sharedInstance] fullscreenChanged];
- }
- else
- {
- [self makeFirstResponder: nil];
- [o_detached_video_window orderOut: nil];
- if( o_extra_video_window )
- [o_extra_video_window orderOut: nil];
-
- if( [self level] != NSNormalWindowLevel )
- [self setLevel: NSNormalWindowLevel];
-
- // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
- [self setAlphaValue:1.0];
- }
-
- if( b_nativeFullscreenMode )
- {
- if( [NSApp presentationOptions] & NSApplicationPresentationFullScreen )
- [o_bottombar_view setHidden: b_videoPlayback];
- else
- [o_bottombar_view setHidden: NO];
- if( b_videoPlayback && b_fullscreen )
- [o_fspanel setActive: nil];
- if( !b_videoPlayback )
- [o_fspanel setNonActive: nil];
- }
-
- if (!b_videoPlayback && b_fullscreen)
- {
- if (!b_nativeFullscreenMode)
- [[VLCCoreInteraction sharedInstance] toggleFullscreen];
- }
-}
-
-- (void)resizeWindow
-{
- if( b_fullscreen || ( b_nativeFullscreenMode && [NSApp presentationOptions] & NSApplicationPresentationFullScreen ) )
- return;
-
- id o_videoWindow = b_nonembedded ? o_detached_video_window : self;
- NSSize windowMinSize = [o_videoWindow minSize];
- NSRect screenFrame = [[o_videoWindow screen] visibleFrame];
-
- NSPoint topleftbase = NSMakePoint( 0, [o_videoWindow frame].size.height );
- NSPoint topleftscreen = [o_videoWindow convertBaseToScreen: topleftbase];
-
- unsigned int i_width = nativeVideoSize.width;
- unsigned int i_height = nativeVideoSize.height;
- if (i_width < windowMinSize.width)
- i_width = windowMinSize.width;
- if (i_height < f_min_video_height)
- i_height = f_min_video_height;
-
- /* Calculate the window's new size */
- NSRect new_frame;
- new_frame.size.width = [o_videoWindow frame].size.width - [o_video_view frame].size.width + i_width;
- new_frame.size.height = [o_videoWindow frame].size.height - [o_video_view frame].size.height + i_height;
- new_frame.origin.x = topleftscreen.x;
- new_frame.origin.y = topleftscreen.y - new_frame.size.height;
-
- /* make sure the window doesn't exceed the screen size the window is on */
- if( new_frame.size.width > screenFrame.size.width )
- {
- new_frame.size.width = screenFrame.size.width;
- new_frame.origin.x = screenFrame.origin.x;
- }
- if( new_frame.size.height > screenFrame.size.height )
- {
- new_frame.size.height = screenFrame.size.height;
- new_frame.origin.y = screenFrame.origin.y;
- }
- if( new_frame.origin.y < screenFrame.origin.y )
- new_frame.origin.y = screenFrame.origin.y;
-
- CGFloat right_screen_point = screenFrame.origin.x + screenFrame.size.width;
- CGFloat right_window_point = new_frame.origin.x + new_frame.size.width;
- if( right_window_point > right_screen_point )
- new_frame.origin.x -= ( right_window_point - right_screen_point );
-
- [[o_videoWindow animator] setFrame:new_frame display:YES];
-}
-
-- (void)setNativeVideoSize:(NSSize)size
-{
- nativeVideoSize = size;
-
- if( config_GetInt( VLCIntf, "macosx-video-autoresize" ) && !b_fullscreen && !config_GetInt( VLCIntf, "macosx-background" ) )
- [self performSelectorOnMainThread:@selector(resizeWindow) withObject:nil waitUntilDone:NO];
-}
-
-// Called automatically if window's acceptsMouseMovedEvents property is true
-- (void)mouseMoved:(NSEvent *)theEvent
-{
- if (b_fullscreen)
- [self recreateHideMouseTimer];
-
- [super mouseMoved: theEvent];
-}
-
-- (void)recreateHideMouseTimer
-{
- if (t_hide_mouse_timer != nil) {
- [t_hide_mouse_timer invalidate];
- [t_hide_mouse_timer release];
- }
-
- t_hide_mouse_timer = [NSTimer scheduledTimerWithTimeInterval:2
- target:self
- selector:@selector(hideMouseCursor:)
- userInfo:nil
- repeats:NO];
- [t_hide_mouse_timer retain];
-}
-
-// NSTimer selectors require this function signature as per Apple's docs
-- (void)hideMouseCursor:(NSTimer *)timer
-{
- [NSCursor setHiddenUntilMouseMoves: YES];
-}
-
-#pragma mark -
-#pragma mark Fullscreen support
-- (void)showFullscreenController
-{
- if (b_fullscreen && [[VLCMain sharedInstance] activeVideoPlayback] )
- [o_fspanel fadeIn];
-}
-
-- (BOOL)isFullscreen
-{
- return b_fullscreen;
-}
-
-- (void)lockFullscreenAnimation
-{
- [o_animation_lock lock];
-}
-
-- (void)unlockFullscreenAnimation
-{
- [o_animation_lock unlock];
-}
-
-- (void)enterFullscreen
-{
- NSMutableDictionary *dict1, *dict2;
- NSScreen *screen;
- NSRect screen_rect;
- NSRect rect;
- BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
- o_current_video_window = [o_video_view window];
-
- screen = [NSScreen screenWithDisplayID:(CGDirectDisplayID)config_GetInt( VLCIntf, "macosx-vdev" )];
- [self lockFullscreenAnimation];
-
- if (!screen)
- {
- msg_Dbg( VLCIntf, "chosen screen isn't present, using current screen for fullscreen mode" );
- screen = [o_current_video_window screen];
- }
- if (!screen)
- {
- msg_Dbg( VLCIntf, "Using deepest screen" );
- screen = [NSScreen deepestScreen];
- }
-
- screen_rect = [screen frame];
-
- [o_fullscreen_btn setState: YES];
- if (b_video_deco)
- [o_detached_fullscreen_btn setState: YES];
-
- [self recreateHideMouseTimer];
-
- if( blackout_other_displays )
- [screen blackoutOtherScreens];
-
- /* Make sure we don't see the window flashes in float-on-top mode */
- i_originalLevel = [o_current_video_window level];
- [o_current_video_window setLevel:NSNormalWindowLevel];
-
- /* Only create the o_fullscreen_window if we are not in the middle of the zooming animation */
- if (!o_fullscreen_window)
- {
- /* We can't change the styleMask of an already created NSWindow, so we create another window, and do eye catching stuff */
-
- rect = [[o_video_view superview] convertRect: [o_video_view frame] toView: nil]; /* Convert to Window base coord */
- rect.origin.x += [o_current_video_window frame].origin.x;
- rect.origin.y += [o_current_video_window frame].origin.y;
- o_fullscreen_window = [[VLCWindow alloc] initWithContentRect:rect styleMask: NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:YES];
- [o_fullscreen_window setBackgroundColor: [NSColor blackColor]];
- [o_fullscreen_window setCanBecomeKeyWindow: YES];
- [o_fullscreen_window setCanBecomeMainWindow: YES];
-
- if (![o_current_video_window isVisible] || [o_current_video_window alphaValue] == 0.0)
- {
- /* We don't animate if we are not visible, instead we
- * simply fade the display */
- CGDisplayFadeReservationToken token;
-
- if( blackout_other_displays )
- {
- CGAcquireDisplayFadeReservation( kCGMaxDisplayReservationInterval, &token );
- CGDisplayFade( token, 0.5, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
- }
-
- if ([screen isMainScreen])
- {
- if (OSX_LEOPARD)
- SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
- else
- [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
- }
-
- [[o_video_view superview] replaceSubview:o_video_view with:o_temp_view];
- [o_temp_view setFrame:[o_video_view frame]];
- [o_fullscreen_window setContentView:o_video_view];
-
- [o_fullscreen_window makeKeyAndOrderFront:self];
- [o_fullscreen_window orderFront:self animate:YES];
-
- [o_fullscreen_window setFrame:screen_rect display:YES animate:YES];
- [o_fullscreen_window setLevel:NSNormalWindowLevel];
-
- if( blackout_other_displays )
- {
- CGDisplayFade( token, 0.3, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
- CGReleaseDisplayFadeReservation( token );
- }
-
- /* Will release the lock */
- [self hasBecomeFullscreen];
-
- return;
- }
-
- /* Make sure we don't see the o_video_view disappearing of the screen during this operation */
- NSDisableScreenUpdates();
- [[o_video_view superview] replaceSubview:o_video_view with:o_temp_view];
- [o_temp_view setFrame:[o_video_view frame]];
- [o_fullscreen_window setContentView:o_video_view];
- [o_fullscreen_window makeKeyAndOrderFront:self];
- NSEnableScreenUpdates();
+ vlc_object_release(p_input);
+ } else {
+ [self setTitle: _NS("VLC media player")];
+ [self setRepresentedURL: nil];
}
+}
- /* We are in fullscreen (and no animation is running) */
- if (b_fullscreen)
- {
- /* Make sure we are hidden */
- [o_current_video_window orderOut: self];
+- (void)updateWindow
+{
+ [o_controls_bar updateControls];
+ [[[VLCMain sharedInstance] voutController] updateWindowsControlsBarWithSelector:@selector(updateControls)];
- [self unlockFullscreenAnimation];
- return;
- }
+ bool b_seekable = false;
- if (o_fullscreen_anim1)
- {
- [o_fullscreen_anim1 stopAnimation];
- [o_fullscreen_anim1 release];
- }
- if (o_fullscreen_anim2)
- {
- [o_fullscreen_anim2 stopAnimation];
- [o_fullscreen_anim2 release];
- }
+ playlist_t * p_playlist = pl_Get(VLCIntf);
+ input_thread_t * p_input = playlist_CurrentInput(p_playlist);
+ if (p_input) {
+ /* seekable streams */
+ b_seekable = var_GetBool(p_input, "can-seek");
- if ([screen isMainScreen])
- {
- if (OSX_LEOPARD)
- SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
- else
- [NSApp setPresentationOptions:(NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
+ vlc_object_release(p_input);
}
- dict1 = [[NSMutableDictionary alloc] initWithCapacity:2];
- dict2 = [[NSMutableDictionary alloc] initWithCapacity:3];
-
- [dict1 setObject:o_current_video_window forKey:NSViewAnimationTargetKey];
- [dict1 setObject:NSViewAnimationFadeOutEffect forKey:NSViewAnimationEffectKey];
-
- [dict2 setObject:o_fullscreen_window forKey:NSViewAnimationTargetKey];
- [dict2 setObject:[NSValue valueWithRect:[o_fullscreen_window frame]] forKey:NSViewAnimationStartFrameKey];
- [dict2 setObject:[NSValue valueWithRect:screen_rect] forKey:NSViewAnimationEndFrameKey];
-
- /* Strategy with NSAnimation allocation:
- - Keep at most 2 animation at a time
- - leaveFullscreen/enterFullscreen are the only responsible for releasing and alloc-ing
- */
- o_fullscreen_anim1 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict1]];
- o_fullscreen_anim2 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict2]];
-
- [dict1 release];
- [dict2 release];
-
- [o_fullscreen_anim1 setAnimationBlockingMode: NSAnimationNonblocking];
- [o_fullscreen_anim1 setDuration: 0.3];
- [o_fullscreen_anim1 setFrameRate: 30];
- [o_fullscreen_anim2 setAnimationBlockingMode: NSAnimationNonblocking];
- [o_fullscreen_anim2 setDuration: 0.2];
- [o_fullscreen_anim2 setFrameRate: 30];
-
- [o_fullscreen_anim2 setDelegate: self];
- [o_fullscreen_anim2 startWhenAnimation: o_fullscreen_anim1 reachesProgress: 1.0];
+ [self updateTimeSlider];
+ if ([o_fspanel respondsToSelector:@selector(setSeekable:)])
+ [o_fspanel setSeekable: b_seekable];
- [o_fullscreen_anim1 startAnimation];
- /* fullscreenAnimation will be unlocked when animation ends */
+ PL_LOCK;
+ if ([[[VLCMain sharedInstance] playlist] currentPlaylistRoot] != p_playlist->p_local_category || p_playlist->p_local_category->i_children > 0)
+ [self hideDropZone];
+ else
+ [self showDropZone];
+ PL_UNLOCK;
+ [o_sidebar_view setNeedsDisplay:YES];
}
-- (void)hasBecomeFullscreen
+- (void)setPause
{
- if( [[o_video_view subviews] count] > 0 )
- [o_fullscreen_window makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
-
- [o_fullscreen_window makeKeyWindow];
- [o_fullscreen_window setAcceptsMouseMovedEvents: YES];
-
- /* tell the fspanel to move itself to front next time it's triggered */
- [o_fspanel setVoutWasUpdated: (int)[[o_fullscreen_window screen] displayID]];
- [o_fspanel setActive: nil];
-
- if( [o_current_video_window isVisible] )
- [o_current_video_window orderOut: self];
-
- b_fullscreen = YES;
- [self unlockFullscreenAnimation];
-}
+ [o_controls_bar setPause];
+ [o_fspanel setPause];
-- (void)leaveFullscreen
-{
- [self leaveFullscreenAndFadeOut: NO];
+ [[[VLCMain sharedInstance] voutController] updateWindowsControlsBarWithSelector:@selector(setPause)];
}
-- (void)leaveFullscreenAndFadeOut: (BOOL)fadeout
+- (void)setPlay
{
- NSMutableDictionary *dict1, *dict2;
- NSRect frame;
- BOOL blackout_other_displays = config_GetInt( VLCIntf, "macosx-black" );
-
- if( !o_current_video_window )
- return;
-
- [self lockFullscreenAnimation];
-
- [o_fullscreen_btn setState: NO];
- if (b_video_deco)
- [o_detached_fullscreen_btn setState: NO];
-
- /* We always try to do so */
- [NSScreen unblackoutScreens];
-
- vout_thread_t *p_vout = getVout();
- if (p_vout)
- {
- if( var_GetBool( p_vout, "video-on-top" ) )
- [[o_video_view window] setLevel: NSStatusWindowLevel];
- else
- [[o_video_view window] setLevel: NSNormalWindowLevel];
- vlc_object_release( p_vout );
- }
- [[o_video_view window] makeKeyAndOrderFront: nil];
-
- /* Don't do anything if o_fullscreen_window is already closed */
- if (!o_fullscreen_window)
- {
- [self unlockFullscreenAnimation];
- return;
- }
-
- if (fadeout)
- {
- /* We don't animate if we are not visible, instead we
- * simply fade the display */
- CGDisplayFadeReservationToken token;
-
- if( blackout_other_displays )
- {
- CGAcquireDisplayFadeReservation( kCGMaxDisplayReservationInterval, &token );
- CGDisplayFade( token, 0.3, kCGDisplayBlendNormal, kCGDisplayBlendSolidColor, 0, 0, 0, YES );
- }
-
- [o_fspanel setNonActive: nil];
- if (OSX_LEOPARD)
- SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
- else
- [NSApp setPresentationOptions: NSApplicationPresentationDefault];
-
- /* Will release the lock */
- [self hasEndedFullscreen];
-
- /* Our window is hidden, and might be faded. We need to workaround that, so note it
- * here */
- b_window_is_invisible = YES;
-
- if( blackout_other_displays )
- {
- CGDisplayFade( token, 0.5, kCGDisplayBlendSolidColor, kCGDisplayBlendNormal, 0, 0, 0, NO );
- CGReleaseDisplayFadeReservation( token );
- }
-
- return;
- }
-
- [o_current_video_window setAlphaValue: 0.0];
- [o_current_video_window orderFront: self];
- [[o_video_view window] orderFront: self];
-
- [o_fspanel setNonActive: nil];
- if (OSX_LEOPARD)
- SetSystemUIMode( kUIModeNormal, kUIOptionAutoShowMenuBar);
- else
- [NSApp setPresentationOptions:(NSApplicationPresentationDefault)];
-
- if (o_fullscreen_anim1)
- {
- [o_fullscreen_anim1 stopAnimation];
- [o_fullscreen_anim1 release];
- }
- if (o_fullscreen_anim2)
- {
- [o_fullscreen_anim2 stopAnimation];
- [o_fullscreen_anim2 release];
- }
-
- frame = [[o_temp_view superview] convertRect: [o_temp_view frame] toView: nil]; /* Convert to Window base coord */
- frame.origin.x += [o_current_video_window frame].origin.x;
- frame.origin.y += [o_current_video_window frame].origin.y;
-
- dict2 = [[NSMutableDictionary alloc] initWithCapacity:2];
- [dict2 setObject:o_current_video_window forKey:NSViewAnimationTargetKey];
- [dict2 setObject:NSViewAnimationFadeInEffect forKey:NSViewAnimationEffectKey];
-
- o_fullscreen_anim2 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict2, nil]];
- [dict2 release];
-
- [o_fullscreen_anim2 setAnimationBlockingMode: NSAnimationNonblocking];
- [o_fullscreen_anim2 setDuration: 0.3];
- [o_fullscreen_anim2 setFrameRate: 30];
-
- [o_fullscreen_anim2 setDelegate: self];
-
- dict1 = [[NSMutableDictionary alloc] initWithCapacity:3];
-
- [dict1 setObject:o_fullscreen_window forKey:NSViewAnimationTargetKey];
- [dict1 setObject:[NSValue valueWithRect:[o_fullscreen_window frame]] forKey:NSViewAnimationStartFrameKey];
- [dict1 setObject:[NSValue valueWithRect:frame] forKey:NSViewAnimationEndFrameKey];
-
- o_fullscreen_anim1 = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObjects:dict1, nil]];
- [dict1 release];
-
- [o_fullscreen_anim1 setAnimationBlockingMode: NSAnimationNonblocking];
- [o_fullscreen_anim1 setDuration: 0.2];
- [o_fullscreen_anim1 setFrameRate: 30];
- [o_fullscreen_anim2 startWhenAnimation: o_fullscreen_anim1 reachesProgress: 1.0];
+ [o_controls_bar setPlay];
+ [o_fspanel setPlay];
- /* Make sure o_fullscreen_window is the frontmost window */
- [o_fullscreen_window orderFront: self];
+ [[[VLCMain sharedInstance] voutController] updateWindowsControlsBarWithSelector:@selector(setPlay)];
- [o_fullscreen_anim1 startAnimation];
- /* fullscreenAnimation will be unlocked when animation ends */
}
-- (void)hasEndedFullscreen
+- (void)updateVolumeSlider
{
- b_fullscreen = NO;
-
- /* This function is private and should be only triggered at the end of the fullscreen change animation */
- /* Make sure we don't see the o_video_view disappearing of the screen during this operation */
- NSDisableScreenUpdates();
- [o_video_view retain];
- [o_video_view removeFromSuperviewWithoutNeedingDisplay];
- [[o_temp_view superview] replaceSubview:o_temp_view with:o_video_view];
- [o_video_view release];
- [o_video_view setFrame:[o_temp_view frame]];
- if( [[o_video_view subviews] count] > 0 )
- [[o_video_view window] makeFirstResponder: [[o_video_view subviews] objectAtIndex:0]];
- if( !b_nonembedded )
- [super makeKeyAndOrderFront:self]; /* our version contains a workaround */
- else
- [[o_video_view window] makeKeyAndOrderFront: self];
- [o_fullscreen_window orderOut: self];
- NSEnableScreenUpdates();
-
- [o_fullscreen_window release];
- o_fullscreen_window = nil;
- [[o_video_view window] setLevel:i_originalLevel];
- [[o_video_view window] setAlphaValue: config_GetFloat( VLCIntf, "macosx-opaqueness" )];
-
- // if we quit fullscreen because there is no video anymore, make sure non-embedded window is not visible
- if( ![[VLCMain sharedInstance] activeVideoPlayback] && b_nonembedded )
- [o_current_video_window orderOut: self];
-
- o_current_video_window = nil;
- [self unlockFullscreenAnimation];
+ [[self controlsBar] updateVolumeSlider];
+ [o_fspanel setVolumeLevel: [[VLCCoreInteraction sharedInstance] volume]];
}
-- (void)animationDidEnd:(NSAnimation*)animation
-{
- NSArray *viewAnimations;
- if( o_makekey_anim == animation )
- {
- [o_makekey_anim release];
- return;
- }
- if ([animation currentValue] < 1.0)
- return;
+#pragma mark -
+#pragma mark Video Output handling
- /* Fullscreen ended or started (we are a delegate only for leaveFullscreen's/enterFullscren's anim2) */
- viewAnimations = [o_fullscreen_anim2 viewAnimations];
- if ([viewAnimations count] >=1 &&
- [[[viewAnimations objectAtIndex: 0] objectForKey: NSViewAnimationEffectKey] isEqualToString:NSViewAnimationFadeInEffect])
- {
- /* Fullscreen ended */
- [self hasEndedFullscreen];
- }
- else
- {
- /* Fullscreen started */
- [self hasBecomeFullscreen];
- }
+- (void)videoplayWillBeStarted
+{
+ if (!b_fullscreen)
+ frameBeforePlayback = [self frame];
}
-- (void)makeKeyAndOrderFront: (id)sender
+- (void)setVideoplayEnabled
{
- /* Hack
- * when we exit fullscreen and fade out, we may endup in
- * having a window that is faded. We can't have it fade in unless we
- * animate again. */
-
- if(!b_window_is_invisible)
- {
- /* Make sure we don't do it too much */
- [super makeKeyAndOrderFront: sender];
- return;
- }
-
- [super setAlphaValue:0.0f];
- [super makeKeyAndOrderFront: sender];
-
- NSMutableDictionary * dict = [[NSMutableDictionary alloc] initWithCapacity:2];
- [dict setObject:self forKey:NSViewAnimationTargetKey];
- [dict setObject:NSViewAnimationFadeInEffect forKey:NSViewAnimationEffectKey];
+ BOOL b_videoPlayback = [[VLCMain sharedInstance] activeVideoPlayback];
+
+ if (!b_videoPlayback) {
+ if (!b_nonembedded && (!b_nativeFullscreenMode || (b_nativeFullscreenMode && !b_fullscreen)) && frameBeforePlayback.size.width > 0 && frameBeforePlayback.size.height > 0)
+ [[self animator] setFrame:frameBeforePlayback display:YES];
- o_makekey_anim = [[NSViewAnimation alloc] initWithViewAnimations:[NSArray arrayWithObject:dict]];
- [dict release];
+ // update fs button to reflect state for next startup
+ if (var_InheritBool(VLCIntf, "fullscreen") || var_GetBool(pl_Get(VLCIntf), "fullscreen")) {
+ [o_controls_bar setFullscreenState:YES];
+ }
- [o_makekey_anim setAnimationBlockingMode: NSAnimationNonblocking];
- [o_makekey_anim setDuration: 0.1];
- [o_makekey_anim setFrameRate: 30];
- [o_makekey_anim setDelegate: self];
+ [self makeFirstResponder: o_playlist_table];
+ [[[VLCMain sharedInstance] voutController] updateWindowLevelForHelperWindows: NSNormalWindowLevel];
- [o_makekey_anim startAnimation];
- b_window_is_invisible = NO;
+ // restore alpha value to 1 for the case that macosx-opaqueness is set to < 1
+ [self setAlphaValue:1.0];
+ }
- /* fullscreenAnimation will be unlocked when animation ends */
+ if (b_nativeFullscreenMode) {
+ if ([self hasActiveVideo] && [self fullscreen]) {
+ [[o_controls_bar bottomBarView] setHidden: b_videoPlayback];
+ [o_fspanel setActive: nil];
+ } else {
+ [[o_controls_bar bottomBarView] setHidden: NO];
+ [o_fspanel setNonActive: nil];
+ }
+ }
}
#pragma mark -
#pragma mark Lion native fullscreen handling
- (void)windowWillEnterFullScreen:(NSNotification *)notification
{
- // workaround, see #6668
- [NSApp setPresentationOptions:(NSApplicationPresentationFullScreen | NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar)];
+ [super windowWillEnterFullScreen:notification];
- var_SetBool( pl_Get( VLCIntf ), "fullscreen", true );
-
- vout_thread_t *p_vout = getVout();
- if( p_vout )
- {
- var_SetBool( p_vout, "fullscreen", true );
- vlc_object_release( p_vout );
- }
-
- [o_video_view setFrame: [[self contentView] frame]];
- b_fullscreen = YES;
-
- [self recreateHideMouseTimer];
- i_originalLevel = [self level];
- [self setLevel:NSNormalWindowLevel];
-
- if (b_dark_interface)
- {
- [o_titlebar_view removeFromSuperviewWithoutNeedingDisplay];
-
- NSRect winrect;
- CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
- winrect = [self frame];
-
- winrect.size.height = winrect.size.height - f_titleBarHeight;
- [self setFrame: winrect display:NO animate:NO];
- winrect = [o_split_view frame];
- winrect.size.height = winrect.size.height + f_titleBarHeight;
- [o_split_view setFrame: winrect];
+ // update split view frame after removing title bar
+ if (b_dark_interface) {
+ NSRect frame = [[self contentView] frame];
+ frame.origin.y += [o_controls_bar height];
+ frame.size.height -= [o_controls_bar height];
+ [o_split_view setFrame:frame];
}
-
- if ([[VLCMain sharedInstance] activeVideoPlayback])
- [o_bottombar_view setHidden: YES];
-
- [self setMovableByWindowBackground: NO];
-}
-
-- (void)windowDidEnterFullScreen:(NSNotification *)notification
-{
- // Indeed, we somehow can have an "inactive" fullscreen (but a visible window!).
- // But this creates some problems when leaving fs over remote intfs, so activate app here.
- [NSApp activateIgnoringOtherApps:YES];
-
- [o_fspanel setVoutWasUpdated: (int)[[self screen] displayID]];
- [o_fspanel setActive: nil];
}
- (void)windowWillExitFullScreen:(NSNotification *)notification
{
+ [super windowWillExitFullScreen: notification];
- var_SetBool( pl_Get( VLCIntf ), "fullscreen", false );
-
- vout_thread_t *p_vout = getVout();
- if( p_vout )
- {
- var_SetBool( p_vout, "fullscreen", false );
- vlc_object_release( p_vout );
+ // update split view frame after readding title bar
+ if (b_dark_interface) {
+ NSRect frame = [o_split_view frame];
+ frame.size.height -= [o_titlebar_view frame].size.height;
+ [o_split_view setFrame:frame];
}
+}
+#pragma mark -
+#pragma mark Fullscreen support
- [o_video_view setFrame: [o_split_view frame]];
- [NSCursor setHiddenUntilMouseMoves: NO];
- [o_fspanel setNonActive: nil];
- [self setLevel:i_originalLevel];
- b_fullscreen = NO;
-
- if (b_dark_interface)
- {
- NSRect winrect;
- CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
- winrect = [self frame];
-
- [o_titlebar_view setFrame: NSMakeRect( 0, winrect.size.height - f_titleBarHeight,
- winrect.size.width, f_titleBarHeight )];
- [[self contentView] addSubview: o_titlebar_view];
+- (void)showFullscreenController
+{
+ id currentWindow = [NSApp keyWindow];
+ if ([currentWindow respondsToSelector:@selector(hasActiveVideo)] && [currentWindow hasActiveVideo]) {
+ if ([currentWindow respondsToSelector:@selector(fullscreen)] && [currentWindow fullscreen] && ![[currentWindow videoView] isHidden]) {
- winrect.size.height = winrect.size.height + f_titleBarHeight;
- [self setFrame: winrect display:NO animate:NO];
- winrect = [o_split_view frame];
- winrect.size.height = winrect.size.height - f_titleBarHeight;
- [o_split_view setFrame: winrect];
- [o_video_view setFrame: winrect];
+ if ([[VLCMain sharedInstance] activeVideoPlayback])
+ [o_fspanel fadeIn];
+ }
}
- if ([[VLCMain sharedInstance] activeVideoPlayback])
- [o_bottombar_view setHidden: NO];
-
- [self setMovableByWindowBackground: YES];
}
#pragma mark -
return YES;
}
+- (void)mainSplitViewDidResizeSubviews:(id)object
+{
+ i_lastLeftSplitViewWidth = [o_left_split_view frame].size.width;
+ config_PutInt(VLCIntf, "macosx-show-sidebar", ![o_split_view isSubviewCollapsed:o_left_split_view]);
+ [[[VLCMain sharedInstance] mainMenu] updateSidebarMenuItem];
+}
+
+- (void)toggleLeftSubSplitView
+{
+ [o_split_view adjustSubviews];
+ if ([o_split_view isSubviewCollapsed:o_left_split_view])
+ [o_split_view setPosition:i_lastLeftSplitViewWidth ofDividerAtIndex:0];
+ else
+ [o_split_view setPosition:[o_split_view minPossiblePositionOfDividerAtIndex:0] ofDividerAtIndex:0];
+ [[[VLCMain sharedInstance] mainMenu] updateSidebarMenuItem];
+}
+
#pragma mark -
#pragma mark Side Bar Data handling
/* taken under BSD-new from the PXSourceList sample project, adapted for VLC */
- (NSUInteger)sourceList:(PXSourceList*)sourceList numberOfChildrenOfItem:(id)item
{
//Works the same way as the NSOutlineView data source: `nil` means a parent item
- if(item==nil)
+ if (item==nil)
return [o_sidebaritems count];
else
return [[item children] count];
- (id)sourceList:(PXSourceList*)aSourceList child:(NSUInteger)index ofItem:(id)item
{
//Works the same way as the NSOutlineView data source: `nil` means a parent item
- if(item==nil)
+ if (item==nil)
return [o_sidebaritems objectAtIndex:index];
else
return [[item children] objectAtIndex:index];
- (NSInteger)sourceList:(PXSourceList*)aSourceList badgeValueForItem:(id)item
{
- playlist_t * p_playlist = pl_Get( VLCIntf );
- NSInteger i_playlist_size;
+ playlist_t * p_playlist = pl_Get(VLCIntf);
+ NSInteger i_playlist_size = 0;
- if ([[item identifier] isEqualToString: @"playlist"])
- {
+ if ([[item identifier] isEqualToString: @"playlist"]) {
PL_LOCK;
i_playlist_size = p_playlist->p_local_category->i_children;
PL_UNLOCK;
return i_playlist_size;
}
- if ([[item identifier] isEqualToString: @"medialibrary"])
- {
+ if ([[item identifier] isEqualToString: @"medialibrary"]) {
PL_LOCK;
- i_playlist_size = p_playlist->p_ml_category->i_children;
+ if (p_playlist->p_ml_category)
+ i_playlist_size = p_playlist->p_ml_category->i_children;
PL_UNLOCK;
return i_playlist_size;
- (NSMenu*)sourceList:(PXSourceList*)aSourceList menuForEvent:(NSEvent*)theEvent item:(id)item
{
- if ([theEvent type] == NSRightMouseDown || ([theEvent type] == NSLeftMouseDown && ([theEvent modifierFlags] & NSControlKeyMask) == NSControlKeyMask))
- {
- if (item != nil)
- {
+ if ([theEvent type] == NSRightMouseDown || ([theEvent type] == NSLeftMouseDown && ([theEvent modifierFlags] & NSControlKeyMask) == NSControlKeyMask)) {
+ if (item != nil) {
NSMenu * m;
if ([item sdtype] > 0)
{
m = [[NSMenu alloc] init];
- playlist_t * p_playlist = pl_Get( VLCIntf );
- BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded( p_playlist, [[item identifier] UTF8String] );
+ playlist_t * p_playlist = pl_Get(VLCIntf);
+ BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded(p_playlist, [[item identifier] UTF8String]);
if (!sd_loaded)
[m addItemWithTitle:_NS("Enable") action:@selector(sdmenuhandler:) keyEquivalent:@""];
else
- (IBAction)sdmenuhandler:(id)sender
{
NSString * identifier = [sender representedObject];
- if ([identifier length] > 0 && ![identifier isEqualToString:@"lua{sd='freebox',longname='Freebox TV'}"])
- {
- playlist_t * p_playlist = pl_Get( VLCIntf );
- BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded( p_playlist, [identifier UTF8String] );
+ if ([identifier length] > 0 && ![identifier isEqualToString:@"lua{sd='freebox',longname='Freebox TV'}"]) {
+ playlist_t * p_playlist = pl_Get(VLCIntf);
+ BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded(p_playlist, [identifier UTF8String]);
if (!sd_loaded)
- playlist_ServicesDiscoveryAdd( p_playlist, [identifier UTF8String] );
+ playlist_ServicesDiscoveryAdd(p_playlist, [identifier UTF8String]);
else
- playlist_ServicesDiscoveryRemove( p_playlist, [identifier UTF8String] );
+ playlist_ServicesDiscoveryRemove(p_playlist, [identifier UTF8String]);
}
}
- (void)sourceListSelectionDidChange:(NSNotification *)notification
{
- playlist_t * p_playlist = pl_Get( VLCIntf );
+ playlist_t * p_playlist = pl_Get(VLCIntf);
NSIndexSet *selectedIndexes = [o_sidebar_view selectedRowIndexes];
id item = [o_sidebar_view itemAtRow:[selectedIndexes firstIndex]];
//Set the label text to represent the new selection
- if ([item sdtype] > -1 && [[item identifier] length] > 0)
- {
- BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded( p_playlist, [[item identifier] UTF8String] );
+ if ([item sdtype] > -1 && [[item identifier] length] > 0) {
+ BOOL sd_loaded = playlist_IsServicesDiscoveryLoaded(p_playlist, [[item identifier] UTF8String]);
if (!sd_loaded)
- {
- playlist_ServicesDiscoveryAdd( p_playlist, [[item identifier] UTF8String] );
- }
+ playlist_ServicesDiscoveryAdd(p_playlist, [[item identifier] UTF8String]);
}
[o_chosen_category_lbl setStringValue:[item title]];
- if ([[item identifier] isEqualToString:@"playlist"])
- {
+ if ([[item identifier] isEqualToString:@"playlist"]) {
[[[VLCMain sharedInstance] playlist] setPlaylistRoot:p_playlist->p_local_category];
- }
- else if([[item identifier] isEqualToString:@"medialibrary"])
- {
- [[[VLCMain sharedInstance] playlist] setPlaylistRoot:p_playlist->p_ml_category];
- }
- else
- {
+ } else if ([[item identifier] isEqualToString:@"medialibrary"]) {
+ if (p_playlist->p_ml_category)
+ [[[VLCMain sharedInstance] playlist] setPlaylistRoot:p_playlist->p_ml_category];
+ } else {
playlist_item_t * pl_item;
PL_LOCK;
- pl_item = playlist_ChildSearchName( p_playlist->p_root, [[item untranslatedTitle] UTF8String] );
+ pl_item = playlist_ChildSearchName(p_playlist->p_root, [[item untranslatedTitle] UTF8String]);
PL_UNLOCK;
[[[VLCMain sharedInstance] playlist] setPlaylistRoot: pl_item];
}
else
[self showDropZone];
PL_UNLOCK;
+
+ if ([[item identifier] isEqualToString:@"podcast{longname=\"Podcasts\"}"])
+ [self showPodcastControls];
+ else
+ [self hidePodcastControls];
+
+ [[NSNotificationCenter defaultCenter] postNotificationName: @"VLCMediaKeySupportSettingChanged"
+ object: nil
+ userInfo: nil];
}
- (NSDragOperation)sourceList:(PXSourceList *)aSourceList validateDrop:(id <NSDraggingInfo>)info proposedItem:(id)item proposedChildIndex:(NSInteger)index
{
- if ([[item identifier] isEqualToString:@"playlist"] || [[item identifier] isEqualToString:@"medialibrary"] )
- {
+ if ([[item identifier] isEqualToString:@"playlist"] || [[item identifier] isEqualToString:@"medialibrary"]) {
NSPasteboard *o_pasteboard = [info draggingPasteboard];
if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] || [[o_pasteboard types] containsObject: NSFilenamesPboardType])
return NSDragOperationGeneric;
{
NSPasteboard *o_pasteboard = [info draggingPasteboard];
- playlist_t * p_playlist = pl_Get( VLCIntf );
+ playlist_t * p_playlist = pl_Get(VLCIntf);
playlist_item_t *p_node;
if ([[item identifier] isEqualToString:@"playlist"])
else
p_node = p_playlist->p_ml_category;
- if( [[o_pasteboard types] containsObject: NSFilenamesPboardType] )
- {
+ if ([[o_pasteboard types] containsObject: NSFilenamesPboardType]) {
NSArray *o_values = [[o_pasteboard propertyListForType: NSFilenamesPboardType] sortedArrayUsingSelector: @selector(caseInsensitiveCompare:)];
NSUInteger count = [o_values count];
NSMutableArray *o_array = [NSMutableArray arrayWithCapacity:count];
- for( NSUInteger i = 0; i < count; i++)
- {
+ for(NSUInteger i = 0; i < count; i++) {
NSDictionary *o_dic;
- char *psz_uri = make_URI([[o_values objectAtIndex:i] UTF8String], NULL);
- if( !psz_uri )
+ char *psz_uri = vlc_path2uri([[o_values objectAtIndex:i] UTF8String], NULL);
+ if (!psz_uri)
continue;
o_dic = [NSDictionary dictionaryWithObject:[NSString stringWithCString:psz_uri encoding:NSUTF8StringEncoding] forKey:@"ITEM_URL"];
- free( psz_uri );
+ free(psz_uri);
[o_array addObject: o_dic];
}
[[[VLCMain sharedInstance] playlist] appendNodeArray:o_array inNode: p_node atPos:-1 enqueue:YES];
return YES;
}
- else if( [[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"] )
- {
+ else if ([[o_pasteboard types] containsObject: @"VLCPlaylistItemPboardType"]) {
NSArray * array = [[[VLCMain sharedInstance] playlist] draggedItems];
NSUInteger count = [array count];
playlist_item_t * p_item = NULL;
PL_LOCK;
- for( NSUInteger i = 0; i < count; i++ )
- {
+ for(NSUInteger i = 0; i < count; i++) {
p_item = [[array objectAtIndex:i] pointerValue];
- if( !p_item ) continue;
- playlist_NodeAddCopy( p_playlist, p_item, p_node, PLAYLIST_END );
+ if (!p_item) continue;
+ playlist_NodeAddCopy(p_playlist, p_item, p_node, PLAYLIST_END);
}
PL_UNLOCK;
if (count < 1)
return nil;
- for (NSUInteger x = 0; x < count; x++)
- {
- id item = [array objectAtIndex: x]; // save one objc selector call
+ for (NSUInteger x = 0; x < count; x++) {
+ id item = [array objectAtIndex:x]; // save one objc selector call
if ([[item identifier] isEqualToString:object])
return item;
}
}
#pragma mark -
-#pragma mark Accessibility stuff
+#pragma mark Podcast
-- (NSArray *)accessibilityAttributeNames
+- (IBAction)addPodcast:(id)sender
{
- if( !b_dark_interface )
- return [super accessibilityAttributeNames];
-
- static NSMutableArray *attributes = nil;
- if ( attributes == nil ) {
- attributes = [[super accessibilityAttributeNames] mutableCopy];
- NSArray *appendAttributes = [NSArray arrayWithObjects: NSAccessibilitySubroleAttribute,
- NSAccessibilityCloseButtonAttribute,
- NSAccessibilityMinimizeButtonAttribute,
- NSAccessibilityZoomButtonAttribute,
- nil];
-
- for( NSString *attribute in appendAttributes )
- {
- if( ![attributes containsObject:attribute] )
- [attributes addObject:attribute];
- }
- }
- return attributes;
+ [NSApp beginSheet:o_podcast_subscribe_window modalForWindow:self modalDelegate:self didEndSelector:NULL contextInfo:nil];
}
-- (id)accessibilityAttributeValue: (NSString*)o_attribute_name
+- (IBAction)addPodcastWindowAction:(id)sender
{
- if( b_dark_interface )
- {
- VLCMainWindowTitleView *o_tbv = o_titlebar_view;
+ [o_podcast_subscribe_window orderOut:sender];
+ [NSApp endSheet: o_podcast_subscribe_window];
- if( [o_attribute_name isEqualTo: NSAccessibilitySubroleAttribute] )
- return NSAccessibilityStandardWindowSubrole;
+ if (sender == o_podcast_subscribe_ok_btn && [[o_podcast_subscribe_url_fld stringValue] length] > 0) {
+ NSMutableString * podcastConf = [[NSMutableString alloc] init];
+ if (config_GetPsz(VLCIntf, "podcast-urls") != NULL)
+ [podcastConf appendFormat:@"%s|", config_GetPsz(VLCIntf, "podcast-urls")];
- if( [o_attribute_name isEqualTo: NSAccessibilityCloseButtonAttribute] )
- return [[o_tbv closeButton] cell];
-
- if( [o_attribute_name isEqualTo: NSAccessibilityMinimizeButtonAttribute] )
- return [[o_tbv minimizeButton] cell];
-
- if( [o_attribute_name isEqualTo: NSAccessibilityZoomButtonAttribute] )
- return [[o_tbv zoomButton] cell];
+ [podcastConf appendString: [o_podcast_subscribe_url_fld stringValue]];
+ config_PutPsz(VLCIntf, "podcast-urls", [podcastConf UTF8String]);
+ var_SetString(pl_Get(VLCIntf), "podcast-urls", [podcastConf UTF8String]);
+ [podcastConf release];
}
-
- return [super accessibilityAttributeValue: o_attribute_name];
}
-- (id)detachedTitlebarView
+- (IBAction)removePodcast:(id)sender
{
- return o_detached_titlebar_view;
+ if (config_GetPsz(VLCIntf, "podcast-urls") != NULL) {
+ [o_podcast_unsubscribe_pop removeAllItems];
+ [o_podcast_unsubscribe_pop addItemsWithTitles:[@(config_GetPsz(VLCIntf, "podcast-urls")) componentsSeparatedByString:@"|"]];
+ [NSApp beginSheet:o_podcast_unsubscribe_window modalForWindow:self modalDelegate:self didEndSelector:NULL contextInfo:nil];
+ }
}
-@end
-
-@implementation VLCDetachedVideoWindow
-- (id)initWithContentRect:(NSRect)contentRect styleMask:(NSUInteger)styleMask
- backing:(NSBackingStoreType)backingType defer:(BOOL)flag
+- (IBAction)removePodcastWindowAction:(id)sender
{
- b_dark_interface = config_GetInt( VLCIntf, "macosx-interfacestyle" );
- b_video_deco = config_GetInt( VLCIntf, "video-deco" );
-
- if (b_dark_interface || !b_video_deco)
- {
-#ifdef MAC_OS_X_VERSION_10_7
- if (OSX_LION)
- styleMask = NSBorderlessWindowMask | NSResizableWindowMask;
- else
- styleMask = NSBorderlessWindowMask;
-#else
- styleMask = NSBorderlessWindowMask;
-#endif
- }
-
- self = [super initWithContentRect:contentRect styleMask:styleMask
- backing:backingType defer:flag];
+ [o_podcast_unsubscribe_window orderOut:sender];
+ [NSApp endSheet: o_podcast_unsubscribe_window];
- /* we want to be moveable regardless of our style */
- [self setMovableByWindowBackground: YES];
-
- /* we don't want this window to be restored on relaunch */
- if (OSX_LION)
- [self setRestorable:NO];
-
- return self;
-}
+ if (sender == o_podcast_unsubscribe_ok_btn) {
+ NSMutableArray * urls = [[NSMutableArray alloc] initWithArray:[@(config_GetPsz(VLCIntf, "podcast-urls")) componentsSeparatedByString:@"|"]];
+ [urls removeObjectAtIndex: [o_podcast_unsubscribe_pop indexOfSelectedItem]];
+ config_PutPsz(VLCIntf, "podcast-urls", [[urls componentsJoinedByString:@"|"] UTF8String]);
+ var_SetString(pl_Get(VLCIntf), "podcast-urls", config_GetPsz(VLCIntf, "podcast-urls"));
+ [urls release];
-- (void)awakeFromNib
-{
- [self setAcceptsMouseMovedEvents: YES];
+ /* reload the podcast module, since it won't update its list when removing podcasts */
+ playlist_t * p_playlist = pl_Get(VLCIntf);
+ if (playlist_IsServicesDiscoveryLoaded(p_playlist, "podcast{longname=\"Podcasts\"}")) {
+ playlist_ServicesDiscoveryRemove(p_playlist, "podcast{longname=\"Podcasts\"}");
+ playlist_ServicesDiscoveryAdd(p_playlist, "podcast{longname=\"Podcasts\"}");
+ [o_playlist_table reloadData];
+ }
- if (b_dark_interface)
- {
- [self setBackgroundColor: [NSColor clearColor]];
- [self setOpaque: NO];
- [self display];
- [self setHasShadow:NO];
- [self setHasShadow:YES];
}
}
-- (IBAction)fullscreen:(id)sender
+- (void)showPodcastControls
{
- [[VLCCoreInteraction sharedInstance] toggleFullscreen];
-}
+ NSRect podcastViewDimensions = [o_podcast_view frame];
+ NSRect rightSplitRect = [o_right_split_view frame];
+ NSRect playlistTableRect = [o_playlist_table frame];
-- (void)performClose:(id)sender
-{
- if (b_dark_interface || !b_video_deco)
- [[VLCMainWindow sharedInstance] performClose: sender];
- else
- [super performClose: sender];
-}
+ podcastViewDimensions.size.width = rightSplitRect.size.width;
+ podcastViewDimensions.origin.x = podcastViewDimensions.origin.y = .0;
+ [o_podcast_view setFrame:podcastViewDimensions];
-- (void)performMiniaturize:(id)sender
-{
- if (b_dark_interface || !b_video_deco)
- [self miniaturize: sender];
- else
- [super performMiniaturize: sender];
-}
+ playlistTableRect.origin.y = playlistTableRect.origin.y + podcastViewDimensions.size.height;
+ playlistTableRect.size.height = playlistTableRect.size.height - podcastViewDimensions.size.height;
+ [o_playlist_table setFrame:playlistTableRect];
+ [o_playlist_table setNeedsDisplay:YES];
-- (void)performZoom:(id)sender
-{
- if (b_dark_interface || !b_video_deco)
- [self customZoom: sender];
- else
- [super performZoom: sender];
+ [o_right_split_view addSubview: o_podcast_view positioned: NSWindowAbove relativeTo: o_right_split_view];
+ b_podcastView_displayed = YES;
}
-- (void)zoom:(id)sender
+- (void)hidePodcastControls
{
- if (b_dark_interface || !b_video_deco)
- [self customZoom: sender];
- else
- [super zoom: sender];
-}
+ if (b_podcastView_displayed) {
+ NSRect podcastViewDimensions = [o_podcast_view frame];
+ NSRect playlistTableRect = [o_playlist_table frame];
-- (BOOL)canBecomeKeyWindow
-{
- return YES;
-}
+ playlistTableRect.origin.y = playlistTableRect.origin.y - podcastViewDimensions.size.height;
+ playlistTableRect.size.height = playlistTableRect.size.height + podcastViewDimensions.size.height;
-- (BOOL)validateMenuItem:(NSMenuItem *)menuItem
-{
- SEL s_menuAction = [menuItem action];
+ [o_podcast_view removeFromSuperviewWithoutNeedingDisplay];
+ [o_playlist_table setFrame: playlistTableRect];
+ b_podcastView_displayed = NO;
+ }
+}
- if ((s_menuAction == @selector(performClose:)) || (s_menuAction == @selector(performMiniaturize:)) || (s_menuAction == @selector(performZoom:)))
- return YES;
+@end
- return [super validateMenuItem:menuItem];
-}
+@implementation VLCDetachedVideoWindow
-/**
- * Given a proposed frame rectangle, return a modified version
- * which will fit inside the screen.
- *
- * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
- * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
- * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
- * Copyright (C) 1996 Free Software Foundation, Inc.
- */
-- (NSRect) customConstrainFrameRect: (NSRect)frameRect toScreen: (NSScreen*)screen
+- (void)awakeFromNib
{
- NSRect screenRect = [screen visibleFrame];
- float difference;
-
- /* Move top edge of the window inside the screen */
- difference = NSMaxY (frameRect) - NSMaxY (screenRect);
- if (difference > 0)
- {
- frameRect.origin.y -= difference;
- }
-
- /* If the window is resizable, resize it (if needed) so that the
- bottom edge is on the screen or can be on the screen when the user moves
- the window */
- difference = NSMaxY (screenRect) - NSMaxY (frameRect);
- if (_styleMask & NSResizableWindowMask)
- {
- float difference2;
-
- difference2 = screenRect.origin.y - frameRect.origin.y;
- difference2 -= difference;
- // Take in account the space between the top of window and the top of the
- // screen which can be used to move the bottom of the window on the screen
- if (difference2 > 0)
- {
- frameRect.size.height -= difference2;
- frameRect.origin.y += difference2;
- }
+ // sets lion fullscreen behaviour
+ [super awakeFromNib];
+ [self setAcceptsMouseMovedEvents: YES];
- /* Ensure that resizing doesn't makewindow smaller than minimum */
- difference2 = [self minSize].height - frameRect.size.height;
- if (difference2 > 0)
- {
- frameRect.size.height += difference2;
- frameRect.origin.y -= difference2;
- }
- }
+ if (b_dark_interface) {
+ [self setBackgroundColor: [NSColor clearColor]];
- return frameRect;
-}
+ [self setOpaque: NO];
+ [self display];
+ [self setHasShadow:NO];
+ [self setHasShadow:YES];
-#define DIST 3
+ NSRect winrect = [self frame];
+ CGFloat f_titleBarHeight = [o_titlebar_view frame].size.height;
-/**
- Zooms the receiver. This method calls the delegate method
- windowShouldZoom:toFrame: to determine if the window should
- be allowed to zoom to full screen.
- *
- * This method is based upon NSWindow.m, part of the GNUstep GUI Library, licensed under LGPLv2+.
- * Authors: Scott Christley <scottc@net-community.com>, Venkat Ajjanagadde <venkat@ocbi.com>,
- * Felipe A. Rodriguez <far@ix.netcom.com>, Richard Frith-Macdonald <richard@brainstorm.co.uk>
- * Copyright (C) 1996 Free Software Foundation, Inc.
- */
-- (void) customZoom: (id)sender
-{
- NSRect maxRect = [[self screen] visibleFrame];
- NSRect currentFrame = [self frame];
+ [self setTitle: _NS("VLC media player")];
+ [o_titlebar_view setFrame: NSMakeRect(0, winrect.size.height - f_titleBarHeight, winrect.size.width, f_titleBarHeight)];
+ [[self contentView] addSubview: o_titlebar_view positioned: NSWindowAbove relativeTo: nil];
- if ([[self delegate] respondsToSelector: @selector(windowWillUseStandardFrame:defaultFrame:)])
- {
- maxRect = [[self delegate] windowWillUseStandardFrame: self defaultFrame: maxRect];
+ } else {
+ [self setBackgroundColor: [NSColor blackColor]];
}
- maxRect = [self customConstrainFrameRect: maxRect toScreen: [self screen]];
-
- // Compare the new frame with the current one
- if ((abs(NSMaxX(maxRect) - NSMaxX(currentFrame)) < DIST)
- && (abs(NSMaxY(maxRect) - NSMaxY(currentFrame)) < DIST)
- && (abs(NSMinX(maxRect) - NSMinX(currentFrame)) < DIST)
- && (abs(NSMinY(maxRect) - NSMinY(currentFrame)) < DIST))
- {
- // Already in zoomed mode, reset user frame, if stored
- if ([self frameAutosaveName] != nil)
- {
- [self setFrame: previousSavedFrame display: YES animate: YES];
- [self saveFrameUsingName: [self frameAutosaveName]];
- }
- return;
- }
+ NSRect videoViewRect = [[self contentView] bounds];
+ if (b_dark_interface)
+ videoViewRect.size.height -= [o_titlebar_view frame].size.height;
+ CGFloat f_bottomBarHeight = [[self controlsBar] height];
+ videoViewRect.size.height -= f_bottomBarHeight;
+ videoViewRect.origin.y = f_bottomBarHeight;
+ [o_video_view setFrame: videoViewRect];
+
+ if (b_dark_interface) {
+ o_color_backdrop = [[VLCColorView alloc] initWithFrame: [o_video_view frame]];
+ [[self contentView] addSubview: o_color_backdrop positioned: NSWindowBelow relativeTo: o_video_view];
+ [o_color_backdrop setAutoresizingMask:NSViewHeightSizable | NSViewWidthSizable];
- if ([self frameAutosaveName] != nil)
- {
- [self saveFrameUsingName: [self frameAutosaveName]];
- previousSavedFrame = [self frame];
+ [self setContentMinSize: NSMakeSize(363., f_min_video_height + [[self controlsBar] height] + [o_titlebar_view frame].size.height)];
+ } else {
+ [self setContentMinSize: NSMakeSize(363., f_min_video_height + [[self controlsBar] height])];
}
-
- [self setFrame: maxRect display: YES animate: YES];
}
-- (NSArray *)accessibilityAttributeNames
+- (void)dealloc
{
- if( !b_dark_interface )
- return [super accessibilityAttributeNames];
-
- static NSMutableArray *attributes = nil;
- if ( attributes == nil ) {
- attributes = [[super accessibilityAttributeNames] mutableCopy];
- NSArray *appendAttributes = [NSArray arrayWithObjects: NSAccessibilitySubroleAttribute,
- NSAccessibilityCloseButtonAttribute,
- NSAccessibilityMinimizeButtonAttribute,
- NSAccessibilityZoomButtonAttribute,
- nil];
-
- for( NSString *attribute in appendAttributes )
- {
- if( ![attributes containsObject:attribute] )
- [attributes addObject:attribute];
- }
- }
- return attributes;
-}
+ if (b_dark_interface)
+ [o_color_backdrop release];
-- (id)accessibilityAttributeValue: (NSString*)o_attribute_name
-{
- if( b_dark_interface )
- {
- VLCMainWindowTitleView *o_tbv = [[VLCMainWindow sharedInstance] detachedTitlebarView];
-
- if( [o_attribute_name isEqualTo: NSAccessibilitySubroleAttribute] )
- return NSAccessibilityStandardWindowSubrole;
-
- if( [o_attribute_name isEqualTo: NSAccessibilityCloseButtonAttribute] )
- return [[o_tbv closeButton] cell];
-
- if( [o_attribute_name isEqualTo: NSAccessibilityMinimizeButtonAttribute] )
- return [[o_tbv minimizeButton] cell];
-
- if( [o_attribute_name isEqualTo: NSAccessibilityZoomButtonAttribute] )
- return [[o_tbv zoomButton] cell];
- }
-
- return [super accessibilityAttributeValue: o_attribute_name];
+ [super dealloc];
}
@end
projects / vlc / blobdiff