/*****************************************************************************
* fspanel.m: MacOS X full screen panel
*****************************************************************************
- * Copyright (C) 2006-2012 VLC authors and VideoLAN
+ * Copyright (C) 2006-2013 VLC authors and VideoLAN
* $Id$
*
* Authors: Jérôme Decoodt <djc at videolan dot org>
* Felix Paul Kühne <fkuehne at videolan dot 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
/* let the window sit on top of everything else and start out completely transparent */
[win setLevel:NSModalPanelWindowLevel];
- i_device = 0;
+ i_device = config_GetInt(VLCIntf, "macosx-vdev");
hideAgainTimer = fadeTimer = nil;
[self setNonActive:nil];
return win;
if (!isInside)
[self mouseExited:NULL];
- [self center];
-
/* get a notification if VLC isn't the active app anymore */
[[NSNotificationCenter defaultCenter]
addObserver: self
[[self contentView] setStreamTitle: o_title];
}
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time
+- (void)updatePositionAndTime
{
- [[self contentView] setStreamPos:f_pos andTime: o_time];
+ [[self contentView] updatePositionAndTime];
}
- (void)setSeekable:(BOOL) b_seekable
- (void)setActive:(id)noData
{
b_nonActive = NO;
+
[[VLCMain sharedInstance] showFullscreenController];
}
[o_vout_window release];
o_vout_window = [o_window retain];
int i_newdevice = (int)[[o_vout_window screen] displayID];
- if (i_newdevice != i_device) {
- i_device = i_newdevice;
+ if (i_newdevice != i_device && i_device != 0)
[self center];
- }
+ i_device = i_newdevice;
}
@end
id view = [super initWithFrame:frameRect];
fillColor = [[NSColor clearColor] retain];
NSRect s_rc = [self frame];
- addButton(o_prev, @"fs_skip_previous" , @"fs_skip_previous_highlight", 174, 15, prev, _NS("Click to go to the previous playlist item."), _NS("Previous"));
- addButton(o_bwd, @"fs_rewind" , @"fs_rewind_highlight" , 211, 14, backward, _NS("Click and hold to skip backward through the current media."), _NS("Backward"));
- addButton(o_play, @"fs_play" , @"fs_play_highlight" , 267, 10, play, _NS("Click to play or pause the current media."), _NS("Play/Pause"));
- addButton(o_fwd, @"fs_forward" , @"fs_forward_highlight" , 313, 14, forward, _NS("Click and hold to skip forward through the current media."), _NS("Forward"));
- addButton(o_next, @"fs_skip_next" , @"fs_skip_next_highlight" , 365, 15, next, _NS("Click to go to the next playlist item."), _NS("Next"));
- addButton(o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13, toggleFullscreen, _NS("Click to exit fullscreen playback."), _NS("Toggle Fullscreen mode"));
+ addButton(o_prev, @"fs_skip_previous_highlight" , @"fs_skip_previous", 174, 15, prev, _NS("Click to go to the previous playlist item."), _NS("Previous"));
+ addButton(o_bwd, @"fs_rewind_highlight" , @"fs_rewind" , 211, 14, backward, _NS("Click and hold to skip backward through the current media."), _NS("Backward"));
+ addButton(o_play, @"fs_play_highlight" , @"fs_play" , 265, 10, play, _NS("Click to play or pause the current media."), _NS("Play/Pause"));
+ addButton(o_fwd, @"fs_forward_highlight" , @"fs_forward" , 313, 14, forward, _NS("Click and hold to skip forward through the current media."), _NS("Forward"));
+ addButton(o_next, @"fs_skip_next_highlight" , @"fs_skip_next" , 365, 15, next, _NS("Click to go to the next playlist item."), _NS("Next"));
+ addButton(o_fullscreen, @"fs_exit_fullscreen_highlight", @"fs_exit_fullscreen", 507, 13, toggleFullscreen, _NS("Click to exit fullscreen playback."), _NS("Toggle Fullscreen mode"));
/*
addButton(o_button, @"image (off state)", @"image (on state)", 38, 51, something, accessibility help string, usual tool tip);
*/
[o_bwd setContinuous:YES];
/* time slider */
- s_rc = [self frame];
+ // (surrounding progress view for swipe behaviour)
s_rc.origin.x = 15;
- s_rc.origin.y = 55;
+ s_rc.origin.y = 45;
s_rc.size.width = 518;
- s_rc.size.height = 9;
+ s_rc.size.height = 13;
+ o_progress_view = [[VLCProgressView alloc] initWithFrame: s_rc];
+ s_rc.origin.x = 0;
+ s_rc.origin.y = 0;
o_fs_timeSlider = [[VLCFSTimeSlider alloc] initWithFrame: s_rc];
[o_fs_timeSlider setMinValue:0];
[o_fs_timeSlider setMaxValue:10000];
[o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];
[[o_fs_volumeSlider cell] accessibilitySetOverrideValue:_NS("Position") forAttribute:NSAccessibilityTitleAttribute];
[[o_fs_timeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change current playback position.") forAttribute:NSAccessibilityDescriptionAttribute];
- [self addSubview: o_fs_timeSlider];
+ [self addSubview: o_progress_view];
+ [o_progress_view addSubview: o_fs_timeSlider];
/* volume slider */
s_rc = [self frame];
s_rc.origin.x = 26;
s_rc.origin.y = 20;
s_rc.size.width = 95;
- s_rc.size.height = 10;
+ s_rc.size.height = 12;
o_fs_volumeSlider = [[VLCFSVolumeSlider alloc] initWithFrame: s_rc];
[o_fs_volumeSlider setMinValue:0];
[o_fs_volumeSlider setMaxValue:AOUT_VOLUME_MAX];
/* time counter and stream title output fields */
s_rc = [self frame];
- s_rc.origin.x = 98;
+ // 10 px gap between time fields
+ s_rc.origin.x = 90;
s_rc.origin.y = 64;
- s_rc.size.width = 352;
+ s_rc.size.width = 361;
s_rc.size.height = 14;
addTextfield(NSTextField, o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor);
+ s_rc.origin.x = 15;
+ s_rc.origin.y = 64;
+ s_rc.size.width = 65;
+ addTextfield(VLCTimeField, o_streamPosition_txt, NSLeftTextAlignment, systemFontOfSize, whiteColor);
s_rc.origin.x = 471;
s_rc.origin.y = 64;
s_rc.size.width = 65;
- addTextfield(VLCTimeField, o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor);
+ addTextfield(VLCTimeField, o_streamLength_txt, NSRightTextAlignment, systemFontOfSize, whiteColor);
+ [o_streamLength_txt setRemainingIdentifier: @"DisplayFullscreenTimeAsTimeRemaining"];
o_background_img = [[NSImage imageNamed:@"fs_background"] retain];
o_vol_sld_img = [[NSImage imageNamed:@"fs_volume_slider_bar"] retain];
- o_vol_mute_img = [[NSImage imageNamed:@"fs_volume_mute"] retain];
- o_vol_max_img = [[NSImage imageNamed:@"fs_volume_max"] retain];
+ o_vol_mute_img = [[NSImage imageNamed:@"fs_volume_mute_highlight"] retain];
+ o_vol_max_img = [[NSImage imageNamed:@"fs_volume_max_highlight"] retain];
o_time_sld_img = [[NSImage imageNamed:@"fs_time_slider"] retain];
return view;
- (void)setPlay
{
- [o_play setImage:[NSImage imageNamed:@"fs_play"]];
- [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];
+ [o_play setImage:[NSImage imageNamed:@"fs_play_highlight"]];
+ [o_play setAlternateImage: [NSImage imageNamed:@"fs_play"]];
}
- (void)setPause
{
- [o_play setImage: [NSImage imageNamed:@"fs_pause"]];
- [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];
+ [o_play setImage: [NSImage imageNamed:@"fs_pause_highlight"]];
+ [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause"]];
}
- (void)setStreamTitle:(NSString *)o_title
[o_streamTitle_txt setStringValue: o_title];
}
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time
+- (void)updatePositionAndTime
{
- [o_streamPosition_txt setStringValue: o_time];
- [o_fs_timeSlider setFloatValue: f_pos];
+ input_thread_t * p_input;
+ p_input = pl_CurrentInput(VLCIntf);
+ if (p_input) {
+
+ vlc_value_t pos;
+ float f_updated;
+
+ var_Get(p_input, "position", &pos);
+ f_updated = 10000. * pos.f_float;
+ [o_fs_timeSlider setFloatValue: f_updated];
+
+ 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));
+
+ // update total duration (right field)
+ if(dur <= 0) {
+ [o_streamLength_txt setHidden: YES];
+ } else {
+ [o_streamLength_txt setHidden: NO];
+
+ NSString *o_total_time;
+ if ([o_streamLength_txt timeRemaining]) {
+ mtime_t remaining = 0;
+ if (dur > time.i_time)
+ remaining = dur - time.i_time;
+ o_total_time = [NSString stringWithFormat: @"-%s", secstotimestr(psz_time, (remaining / 1000000))];
+ } else
+ o_total_time = [NSString stringWithUTF8String: secstotimestr(psz_time, (dur / 1000000))];
+
+ [o_streamLength_txt setStringValue: o_total_time];
+ }
+
+ // update current position (left field)
+ NSString *o_playback_pos = [NSString stringWithUTF8String: secstotimestr(psz_time, (time.i_time / 1000000))];
+
+ [o_streamPosition_txt setStringValue: o_playback_pos];
+ vlc_object_release(p_input);
+ } else {
+ [o_fs_timeSlider setFloatValue: 0.0];
+ [o_streamPosition_txt setStringValue: @"00:00"];
+ [o_streamLength_txt setHidden: YES];
+ }
+
}
- (void)setSeekable:(BOOL)b_seekable
- (IBAction)play:(id)sender
{
- [[VLCCoreInteraction sharedInstance] play];
+ [[VLCCoreInteraction sharedInstance] playOrPause];
}
- (IBAction)forward:(id)sender
addImage(o_vol_sld_img, 26, 23, NSCompositeSourceOver);
addImage(o_vol_mute_img, 16, 18, NSCompositeSourceOver);
addImage(o_vol_max_img, 124, 18, NSCompositeSourceOver);
- addImage(o_time_sld_img, 15, 53, NSCompositeSourceOver);
+ addImage(o_time_sld_img, 15, 45, NSCompositeSourceOver);
}
@end
[[NSGraphicsContext currentContext] restoreGraphicsState];
NSRect knobRect = [[self cell] knobRectFlipped:NO];
- knobRect.origin.y+=7.5;
+ knobRect.origin.y+=4;
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
[self drawKnobInRect: knobRect];
}
- (void)drawKnobInRect:(NSRect) knobRect
{
NSRect image_rect;
- NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob"];
+ NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob_highlight"];
image_rect.size = [img size];
image_rect.origin.x = 0;
image_rect.origin.y = 0;
[[NSGraphicsContext currentContext] restoreGraphicsState];
NSRect knobRect = [[self cell] knobRectFlipped:NO];
- knobRect.origin.y+=6;
+ knobRect.origin.y+=7.5;
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
[self drawKnobInRect: knobRect];
}
projects / vlc / blobdiff