defer:(BOOL)flag
{
id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];
+
+ if (!win)
+ return win;
+
+ self.contentView = [[VLCFSPanelView alloc] initWithFrame:contentRect];
[win setOpaque:NO];
[win setHasShadow: NO];
[win setBackgroundColor:[NSColor clearColor]];
[win setLevel:NSModalPanelWindowLevel];
i_device = config_GetInt(VLCIntf, "macosx-vdev");
hideAgainTimer = fadeTimer = nil;
+ [self setFrameAutosaveName:@"fspanel"];
[self setNonActive:nil];
- return win;
-}
-- (void)awakeFromNib
-{
[self setContentView:[[VLCFSPanelView alloc] initWithFrame: [self frame]]];
BOOL isInside = (NSPointInRect([NSEvent mouseLocation],[self frame]));
[[self contentView] addTrackingRect:[[self contentView] bounds] owner:self userData:nil assumeInside:isInside];
/* get a notification if VLC isn't the active app anymore */
[[NSNotificationCenter defaultCenter]
- addObserver: self
- selector: @selector(setNonActive:)
- name: NSApplicationDidResignActiveNotification
- object: NSApp];
+ addObserver: self
+ selector: @selector(setNonActive:)
+ name: NSApplicationDidResignActiveNotification
+ object: NSApp];
/* Get a notification if VLC is the active app again.
Needed as becomeKeyWindow does not get called when window is activated by clicking */
[[NSNotificationCenter defaultCenter]
- addObserver: self
- selector: @selector(setActive:)
- name: NSApplicationDidBecomeActiveNotification
- object: NSApp];
+ addObserver: self
+ selector: @selector(setActive:)
+ name: NSApplicationDidBecomeActiveNotification
+ object: NSApp];
+
+ return win;
}
/* make sure that we don't become key, since we can't handle hotkeys */
if ([self alphaValue] < 1.0 || b_displayed != YES) {
if (![self fadeTimer])
- [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:@1 repeats:YES]];
+ [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithInt:1] repeats:YES]];
else if ([[[self fadeTimer] userInfo] shortValue]==0)
b_fadeQueued=YES;
}
if (([self alphaValue] > 0.0)) {
if (![self fadeTimer])
- [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:@0 repeats:YES]];
+ [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithInt:0] repeats:YES]];
else if ([[[self fadeTimer] userInfo] shortValue]==1)
b_fadeQueued=YES;
}
[o_button setBezelStyle: NSRegularSquareBezelStyle]; \
[o_button setBordered: NO]; \
[o_button setFont:[NSFont systemFontOfSize:0]]; \
- [o_button setImage:[NSImage imageNamed:imageOff]]; \
- [o_button setAlternateImage:[NSImage imageNamed:imageOn]]; \
+ [o_button setImage:imageFromRes(imageOff)]; \
+ [o_button setAlternateImage:imageFromRes(imageOn)]; \
[o_button sizeToFit]; \
[o_button setTarget: self]; \
[o_button setAction: @selector(action:)]; \
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];
+ [o_fs_volumeSlider setMaxValue: [[VLCCoreInteraction sharedInstance] maxVolume]];
[o_fs_volumeSlider setIntValue:AOUT_VOLUME_DEFAULT];
[o_fs_volumeSlider setContinuous: YES];
[o_fs_volumeSlider setTarget: self];
[o_fs_volumeSlider setAction: @selector(fsVolumeSliderUpdate:)];
+ [o_fs_volumeSlider setUsesBrightArtwork:NO];
[[o_fs_volumeSlider cell] accessibilitySetOverrideValue:_NS("Volume") forAttribute:NSAccessibilityTitleAttribute];
[[o_fs_volumeSlider cell] accessibilitySetOverrideValue:_NS("Click and move the mouse while keeping the button pressed to use this slider to change the volume.") forAttribute:NSAccessibilityDescriptionAttribute];
[self addSubview: o_fs_volumeSlider];
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_highlight"] retain];
- o_vol_max_img = [[NSImage imageNamed:@"fs_volume_max_highlight"] retain];
- o_time_sld_img = [[NSImage imageNamed:@"fs_time_slider"] retain];
+ o_background_img = [imageFromRes(@"fs_background") retain];
+ o_vol_sld_img = [imageFromRes(@"fs_volume_slider_bar") retain];
+ o_vol_mute_img = [imageFromRes(@"fs_volume_mute_highlight") retain];
+ o_vol_max_img = [imageFromRes(@"fs_volume_max_highlight") retain];
+ o_time_sld_img = [imageFromRes(@"fs_time_slider") retain];
return view;
}
- (void)setPlay
{
- [o_play setImage:[NSImage imageNamed:@"fs_play_highlight"]];
- [o_play setAlternateImage: [NSImage imageNamed:@"fs_play"]];
+ [o_play setImage:imageFromRes(@"fs_play_highlight")];
+ [o_play setAlternateImage: imageFromRes(@"fs_play")];
}
- (void)setPause
{
- [o_play setImage: [NSImage imageNamed:@"fs_pause_highlight"]];
- [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause"]];
+ [o_play setImage: imageFromRes(@"fs_pause_highlight")];
+ [o_play setAlternateImage: imageFromRes(@"fs_pause")];
}
- (void)setStreamTitle:(NSString *)o_title
remaining = dur - time.i_time;
o_total_time = [NSString stringWithFormat: @"-%s", secstotimestr(psz_time, (remaining / 1000000))];
} else
- o_total_time = @(secstotimestr(psz_time, (dur / 1000000)));
+ 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 = @(secstotimestr(psz_time, (time.i_time / 1000000)));
+ 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);
- (void)drawKnobInRect:(NSRect)knobRect
{
NSRect image_rect;
- NSImage *img = [NSImage imageNamed:@"fs_time_slider_knob_highlight"];
+ NSImage *img = imageFromRes(@"fs_time_slider_knob_highlight");
image_rect.size = [img size];
image_rect.origin.x = 0;
image_rect.origin.y = 0;
* VLCFSVolumeSlider
*****************************************************************************/
@implementation VLCFSVolumeSlider
+
+- (id)initWithFrame:(NSRect)frame
+{
+ self = [super initWithFrame:frame];
+ if(self) {
+ [self setCell:[[[VolumeSliderCell alloc] init] autorelease]];
+ }
+
+ return self;
+}
+
- (void)drawKnobInRect:(NSRect) knobRect
{
NSRect image_rect;
- NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob_highlight"];
+ NSImage *img = imageFromRes(@"fs_volume_slider_knob_highlight");
image_rect.size = [img size];
image_rect.origin.x = 0;
image_rect.origin.y = 0;
[super drawRect:rect];
[[NSGraphicsContext currentContext] restoreGraphicsState];
+ [self drawFullVolumeMarker];
+
NSRect knobRect = [[self cell] knobRectFlipped:NO];
knobRect.origin.y+=7.5;
[[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
[self drawKnobInRect: knobRect];
}
+- (void)drawFullVolBezierPath:(NSBezierPath*)bezierPath
+{
+ CGFloat fullVolPos = [self fullVolumePos];
+ [bezierPath moveToPoint:NSMakePoint(fullVolPos, [self frame].size.height)];
+ [bezierPath lineToPoint:NSMakePoint(fullVolPos, 1.)];
+}
+
@end
projects / vlc / blobdiff