hide the FSPanel at the same time as the cursor
authorFelix Paul Kühne <fkuehne@videolan.org>
Wed, 26 Mar 2008 11:13:22 +0000 (12:13 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Wed, 26 Mar 2008 11:13:22 +0000 (12:13 +0100)
Additionally, fixed a minor layout bug in the Error & Messages panel

extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/classes.nib
extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/info.nib
extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib
modules/gui/macosx/fspanel.m

index 3c005b3..36b159a 100644 (file)
@@ -1,18 +1,59 @@
-{
-    IBClasses = (
-        {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, 
-        {
-            ACTIONS = {cleanupTable = id; showMessages = id; }; 
-            CLASS = VLCErrorInteractionPanel; 
-            LANGUAGE = ObjC; 
-            OUTLETS = {
-                "o_cleanup_button" = id; 
-                "o_error_table" = id; 
-                "o_messages_btn" = id; 
-                "o_window" = id; 
-            }; 
-            SUPERCLASS = NSObject; 
-        }
-    ); 
-    IBVersion = 1; 
-}
\ No newline at end of file
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+       <key>IBClasses</key>
+       <array>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSApplication</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSResponder</string>
+               </dict>
+               <dict>
+                       <key>ACTIONS</key>
+                       <dict>
+                               <key>cleanupTable</key>
+                               <string>id</string>
+                               <key>showMessages</key>
+                               <string>id</string>
+                       </dict>
+                       <key>CLASS</key>
+                       <string>VLCErrorInteractionPanel</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>OUTLETS</key>
+                       <dict>
+                               <key>o_cleanup_button</key>
+                               <string>id</string>
+                               <key>o_error_table</key>
+                               <string>id</string>
+                               <key>o_messages_btn</key>
+                               <string>id</string>
+                               <key>o_window</key>
+                               <string>id</string>
+                       </dict>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>FirstResponder</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+                       <key>SUPERCLASS</key>
+                       <string>NSObject</string>
+               </dict>
+               <dict>
+                       <key>CLASS</key>
+                       <string>NSObject</string>
+                       <key>LANGUAGE</key>
+                       <string>ObjC</string>
+               </dict>
+       </array>
+       <key>IBVersion</key>
+       <string>1</string>
+</dict>
+</plist>
index 8192448..a6b2025 100644 (file)
@@ -2,15 +2,19 @@
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-       <key>IBDocumentLocation</key>
-       <string>46 162 356 240 0 0 1440 878 </string>
        <key>IBFramework Version</key>
-       <string>456.0</string>
+       <string>644</string>
+       <key>IBLastKnownRelativeProjectPath</key>
+       <string>../../vlc.xcodeproj</string>
+       <key>IBOldestOS</key>
+       <integer>5</integer>
        <key>IBOpenObjects</key>
        <array>
-               <integer>5</integer>
+               <integer>6</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>9A377a</string>
+       <string>9C31</string>
+       <key>targetFramework</key>
+       <string>IBCocoaFramework</string>
 </dict>
 </plist>
index e6f87ad..da27ee8 100644 (file)
Binary files a/extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib and b/extras/package/macosx/Resources/English.lproj/InteractionErrorPanel.nib/keyedobjects.nib differ
index 51e1559..5ca46d8 100644 (file)
-/*****************************************************************************\r
- * fspanel.m: MacOS X full screen panel\r
- *****************************************************************************\r
- * Copyright (C) 2006-2007 the VideoLAN team\r
- * $Id$\r
- *\r
- * Authors: Jérôme Decoodt <djc at videolan dot org>\r
- *          Felix Kühne <fkuehne at videolan dot org>\r
- *\r
- * This program is free software; you can redistribute it and/or modify\r
- * it under the terms of the GNU General Public License as published by\r
- * the Free Software Foundation; either version 2 of the License, or\r
- * (at your option) any later version.\r
- * \r
- * This program is distributed in the hope that it will be useful,\r
- * but WITHOUT ANY WARRANTY; without even the implied warranty of\r
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the\r
- * GNU General Public License for more details.\r
- *\r
- * You should have received a copy of the GNU General Public License\r
- * along with this program; if not, write to the Free Software\r
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.\r
- *****************************************************************************/\r
-\r
-/*****************************************************************************\r
- * Preamble\r
- *****************************************************************************/\r
-#import "intf.h"\r
-#import "controls.h"\r
-#import "vout.h"\r
-#import "misc.h"\r
-#import "fspanel.h"\r
-\r
-#define KEEP_VISIBLE_AFTER_ACTION 4 /* time in half-sec until this panel will hide again after a user's action */\r
-\r
-/*****************************************************************************\r
- * VLCFSPanel\r
- *****************************************************************************/\r
-@implementation VLCFSPanel\r
-/* We override this initializer so we can set the NSBorderlessWindowMask styleMask, and set a few other important settings */\r
-- (id)initWithContentRect:(NSRect)contentRect \r
-                styleMask:(unsigned int)aStyle \r
-                  backing:(NSBackingStoreType)bufferingType \r
-                    defer:(BOOL)flag\r
-{\r
-    id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];\r
-    [win setOpaque:NO];\r
-    [win setHasShadow: NO];\r
-    [win setBackgroundColor:[NSColor clearColor]];\r
-    \r
-    /* let the window sit on top of everything else and start out completely transparent */\r
-    [win setLevel:NSModalPanelWindowLevel];\r
-    i_device = 0;\r
-    [win center];\r
-    [self setNonActive:nil];\r
-\r
-    return win;\r
-}\r
-\r
-- (void)awakeFromNib\r
-{\r
-    [self setContentView:[[VLCFSPanelView alloc] initWithFrame: [self frame]]];\r
-    BOOL isInside = (NSPointInRect([NSEvent mouseLocation],[self frame]));\r
-    [[self contentView] addTrackingRect:[[self contentView] bounds] owner:self userData:nil assumeInside:isInside];\r
-    if (isInside)\r
-        [self mouseEntered:NULL];\r
-    if (!isInside)\r
-        [self mouseExited:NULL];\r
-    \r
-    /* get a notification if VLC isn't the active app anymore */\r
-    [[NSNotificationCenter defaultCenter]\r
-    addObserver: self\r
-       selector: @selector(setNonActive:)\r
-           name: NSApplicationDidResignActiveNotification\r
-         object: NSApp];\r
-    \r
-    /* get a notification if VLC is the active app again */\r
-    [[NSNotificationCenter defaultCenter]\r
-    addObserver: self\r
-       selector: @selector(setActive:)\r
-           name: NSApplicationDidBecomeActiveNotification\r
-         object: NSApp];\r
-}\r
-\r
-/* Windows created with NSBorderlessWindowMask normally can't be key, but we want ours to be */\r
-- (BOOL)canBecomeKeyWindow\r
-{\r
-    return YES;\r
-}\r
-\r
-- (BOOL)mouseDownCanMoveWindow\r
-{\r
-    return YES;\r
-}\r
-\r
--(void)dealloc\r
-{\r
-    [[NSNotificationCenter defaultCenter] removeObserver: self];\r
-    \r
-    if( hideAgainTimer )\r
-        [hideAgainTimer release];\r
-    [self setFadeTimer:nil];\r
-    [super dealloc];\r
-}\r
-\r
--(void)center\r
-{\r
-    /* centre the panel in the lower third of the screen */\r
-    NSPoint theCoordinate;\r
-    NSRect theScreensFrame;\r
-    NSRect theWindowsFrame;\r
-    NSScreen *screen;\r
-    \r
-    /* user-defined screen */\r
-    screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];\r
-    \r
-    if (!screen)\r
-    {\r
-        /* invalid preferences or none specified, using main screen */\r
-        screen = [NSScreen mainScreen];\r
-    }\r
-\r
-    theScreensFrame = [screen frame];\r
-\r
-    theWindowsFrame = [self frame];\r
-    \r
-    theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x;\r
-    theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height + theScreensFrame.origin.y;\r
-    [self setFrameTopLeftPoint: theCoordinate];\r
-}\r
-\r
-- (void)setPlay\r
-{\r
-    [[self contentView] setPlay];\r
-}\r
-\r
-- (void)setPause\r
-{\r
-    [[self contentView] setPause];\r
-}\r
-\r
-- (void)setStreamTitle:(NSString *)o_title\r
-{\r
-    [[self contentView] setStreamTitle: o_title];\r
-}\r
-\r
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time\r
-{\r
-    [[self contentView] setStreamPos:f_pos andTime: o_time];\r
-}\r
-\r
-- (void)setSeekable:(BOOL) b_seekable\r
-{\r
-    [[self contentView] setSeekable: b_seekable];\r
-}\r
-\r
-- (void)setVolumeLevel: (float)f_volumeLevel\r
-{\r
-    [[self contentView] setVolumeLevel: f_volumeLevel];\r
-}\r
-\r
-- (void)setNonActive:(id)noData\r
-{\r
-    b_nonActive = YES;\r
-    [self orderOut: self];\r
-    \r
-    /* here's fadeOut, just without visibly fading */\r
-    b_displayed = NO;\r
-    [self setAlphaValue:0.0];\r
-    [self setFadeTimer:nil];\r
-    b_fadeQueued = NO;\r
-}\r
-\r
-- (void)setActive:(id)noData\r
-{\r
-    if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )\r
-    {\r
-        b_nonActive = NO;\r
-        [self fadeIn];\r
-    }\r
-}\r
-\r
-/* This routine is called repeatedly to fade in the window */\r
-- (void)focus:(NSTimer *)timer\r
-{\r
-    /* we need to push ourselves to front if the vout window was closed since our last display */\r
-    if( b_voutWasUpdated )\r
-    {\r
-        [self orderFront: self];\r
-        b_voutWasUpdated = NO;\r
-    }\r
-\r
-    if( [self alphaValue] < 1.0 )\r
-        [self setAlphaValue:[self alphaValue]+0.1];\r
-    if( [self alphaValue] >= 1.0 )\r
-    {\r
-        b_displayed = YES;\r
-        [self setAlphaValue: 1.0];\r
-        [self setFadeTimer:nil];\r
-        if( b_fadeQueued )\r
-        {\r
-            b_fadeQueued=NO;\r
-            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unfocus:) userInfo:NULL repeats:YES]];\r
-        }\r
-    }\r
-}\r
-\r
-/* This routine is called repeatedly to hide the window */\r
-- (void)unfocus:(NSTimer *)timer\r
-{\r
-    if( b_keptVisible )\r
-    {\r
-        b_keptVisible = NO;\r
-        b_fadeQueued = NO;\r
-        [self setFadeTimer: NULL];\r
-        [self fadeIn];\r
-        return;\r
-    }\r
-    if( [self alphaValue] > 0.0 )\r
-        [self setAlphaValue:[self alphaValue]-0.05];\r
-    if( [self alphaValue] <= 0.05 )\r
-    {\r
-        b_displayed = NO;\r
-        [self setAlphaValue:0.0];\r
-        [self setFadeTimer:nil];\r
-        if( b_fadeQueued )\r
-        {\r
-            b_fadeQueued=NO;\r
-            [self setFadeTimer:\r
-                [NSTimer scheduledTimerWithTimeInterval:0.1 \r
-                                                 target:self \r
-                                               selector:@selector(focus:) \r
-                                               userInfo:NULL \r
-                                                repeats:YES]];\r
-        }\r
-    }\r
-}\r
-\r
-- (void)mouseExited:(NSEvent *)theEvent\r
-{\r
-    /* give up our focus, so the vout may show us again without letting the user clicking it */\r
-    if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )\r
-        [[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];\r
-}\r
-\r
-- (void)fadeIn\r
-{\r
-    /* in case that the user don't want us to appear, just return here */\r
-    if(! config_GetInt( VLCIntf, "macosx-fspanel" ) || b_nonActive )\r
-        return;\r
-    \r
-    [self orderFront: nil];\r
-    \r
-    if( [self alphaValue] < 1.0 || b_displayed != YES )\r
-    {\r
-        if (![self fadeTimer])\r
-            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithShort:1] repeats:YES]];\r
-        else if ([[[self fadeTimer] userInfo] shortValue]==0)\r
-            b_fadeQueued=YES;\r
-    }\r
-    [self autoHide];\r
-}\r
-\r
-- (void)fadeOut\r
-{\r
-    if( NSPointInRect([NSEvent mouseLocation],[self frame]))\r
-        return;\r
-\r
-    if( ( [self alphaValue] > 0.0 ) )\r
-    {\r
-        if (![self fadeTimer])\r
-            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];\r
-        else if ([[[self fadeTimer] userInfo] shortValue]==1)\r
-            b_fadeQueued=YES;\r
-    }\r
-}\r
-\r
-/* triggers a timer to autoHide us again after some seconds of no activity */\r
-- (void)autoHide\r
-{\r
-    /* this will tell the timer to start over again or to start at all */\r
-    b_keptVisible = YES;\r
-    \r
-    /* get us a valid timer */\r
-    if(! b_alreadyCounting )\r
-    {\r
-        hideAgainTimer = [NSTimer scheduledTimerWithTimeInterval: 0.5\r
-                                                          target: self \r
-                                                        selector: @selector(keepVisible:)\r
-                                                        userInfo: nil \r
-                                                         repeats: YES];\r
-        [hideAgainTimer fire];\r
-        [hideAgainTimer retain];\r
-        b_alreadyCounting = YES;\r
-    }\r
-}\r
-\r
-- (void)keepVisible:(NSTimer *)timer\r
-{\r
-    /* if the user triggered an action, start over again */\r
-    if( b_keptVisible )\r
-    {\r
-        i_timeToKeepVisibleInSec = KEEP_VISIBLE_AFTER_ACTION;\r
-        b_keptVisible = NO;\r
-    }\r
-    \r
-    /* count down until we hide ourselfes again and do so if necessary */\r
-    i_timeToKeepVisibleInSec -= 1;\r
-    if( i_timeToKeepVisibleInSec < 1 )\r
-    {\r
-        [NSCursor setHiddenUntilMouseMoves: YES];\r
-        [self fadeOut];\r
-        [timer invalidate];\r
-        [timer release];\r
-        b_alreadyCounting = NO;\r
-        timer = NULL;\r
-    }\r
-}\r
-\r
-/* A getter and setter for our main timer that handles window fading */\r
-- (NSTimer *)fadeTimer\r
-{\r
-    return fadeTimer;\r
-}\r
-\r
-- (void)setFadeTimer:(NSTimer *)timer\r
-{\r
-    [timer retain];\r
-    [fadeTimer invalidate];\r
-    [fadeTimer release];\r
-    fadeTimer=timer;\r
-}\r
-\r
-- (void)mouseDown:(NSEvent *)theEvent\r
-{\r
-    mouseClic = [theEvent locationInWindow];\r
-}\r
-\r
-- (void)mouseDragged:(NSEvent *)theEvent\r
-{\r
-    NSPoint point = [NSEvent mouseLocation];\r
-    point.x -= mouseClic.x;\r
-    point.y -= mouseClic.y;\r
-    [self setFrameOrigin:point];\r
-}\r
-\r
-- (BOOL)isDisplayed\r
-{\r
-    return b_displayed;\r
-}\r
-\r
-- (void)setVoutWasUpdated: (int)i_newdevice;\r
-{\r
-    b_voutWasUpdated = YES;\r
-    if( i_newdevice != i_device )\r
-    {\r
-        i_device = i_newdevice;\r
-        [self center];\r
-    }\r
-}\r
-@end\r
-\r
-/*****************************************************************************\r
- * FSPanelView\r
- *****************************************************************************/\r
-@implementation VLCFSPanelView\r
-\r
-#define addButton( o_button, imageOff, imageOn, _x, _y, action )                                \\r
-    s_rc.origin.x = _x;                                                                         \\r
-    s_rc.origin.y = _y;                                                                         \\r
-    o_button = [[NSButton alloc] initWithFrame: s_rc];                                 \\r
-    [o_button setButtonType: NSMomentaryChangeButton];                                          \\r
-    [o_button setBezelStyle: NSRegularSquareBezelStyle];                                        \\r
-    [o_button setBordered: NO];                                                                 \\r
-    [o_button setFont:[NSFont systemFontOfSize:0]];                                             \\r
-    [o_button setImage:[NSImage imageNamed:imageOff]];                                 \\r
-    [o_button setAlternateImage:[NSImage imageNamed:imageOn]];                         \\r
-    [o_button sizeToFit];                                                                       \\r
-    [o_button setTarget: self];                                                                 \\r
-    [o_button setAction: @selector(action:)];                                                   \\r
-    [self addSubview:o_button];\r
-\r
-#define addTextfield( o_text, align, font, color, size )                                    \\r
-    o_text = [[NSTextField alloc] initWithFrame: s_rc];                            \\r
-    [o_text setDrawsBackground: NO];                                                        \\r
-    [o_text setBordered: NO];                                                               \\r
-    [o_text setEditable: NO];                                                               \\r
-    [o_text setSelectable: NO];                                                             \\r
-    [o_text setStringValue: _NS("(no item is being played)")];                                                    \\r
-    [o_text setAlignment: align];                                                           \\r
-    [o_text setTextColor: [NSColor color]];                                                 \\r
-    [o_text setFont:[NSFont font:[NSFont smallSystemFontSize] - size]];                     \\r
-    [self addSubview:o_text];\r
-\r
-- (id)initWithFrame:(NSRect)frameRect\r
-{\r
-    id view = [super initWithFrame:frameRect];\r
-    fillColor = [[NSColor clearColor] retain];\r
-    NSRect s_rc = [self frame];\r
-    addButton( o_prev, @"fs_skip_previous" , @"fs_skip_previous_highlight", 174, 15, prev );\r
-    addButton( o_bwd, @"fs_rewind"        , @"fs_rewind_highlight"       , 211, 14, backward );\r
-    addButton( o_play, @"fs_play"          , @"fs_play_highlight"         , 267, 10, play );\r
-    addButton( o_fwd, @"fs_forward"       , @"fs_forward_highlight"      , 313, 14, forward );\r
-    addButton( o_next, @"fs_skip_next"     , @"fs_skip_next_highlight"    , 365, 15, next );\r
-    addButton( o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13, windowAction );\r
-/*\r
-    addButton( o_button, @"image (off state)", @"image (on state)", 38, 51, something );\r
- */\r
-\r
-    /* time slider */\r
-    s_rc = [self frame];\r
-    s_rc.origin.x = 15;\r
-    s_rc.origin.y = 53;\r
-    s_rc.size.width = 518;\r
-    s_rc.size.height = 9;\r
-    o_fs_timeSlider = [[VLCFSTimeSlider alloc] initWithFrame: s_rc];\r
-    [o_fs_timeSlider setMinValue:0];\r
-    [o_fs_timeSlider setMaxValue:10000];\r
-    [o_fs_timeSlider setFloatValue: 0];\r
-    [o_fs_timeSlider setContinuous: YES];\r
-    [o_fs_timeSlider setTarget: self];\r
-    [o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];\r
-    [self addSubview: o_fs_timeSlider];\r
-\r
-    /* volume slider */\r
-    s_rc = [self frame];\r
-    s_rc.origin.x = 26;\r
-    s_rc.origin.y = 17.5;\r
-    s_rc.size.width = 95;\r
-    s_rc.size.height = 10;\r
-    o_fs_volumeSlider = [[VLCFSVolumeSlider alloc] initWithFrame: s_rc];\r
-    [o_fs_volumeSlider setMinValue:0];\r
-    [o_fs_volumeSlider setMaxValue:32];\r
-    [o_fs_volumeSlider setFloatValue: 0];\r
-    [o_fs_volumeSlider setContinuous: YES];\r
-    [o_fs_volumeSlider setTarget: self];\r
-    [o_fs_volumeSlider setAction: @selector(fsVolumeSliderUpdate:)];\r
-    [self addSubview: o_fs_volumeSlider];\r
-    \r
-    /* time counter and stream title output fields */\r
-    s_rc = [self frame];\r
-    s_rc.origin.x = 98;\r
-    s_rc.origin.y = 64;\r
-    s_rc.size.width = 352;\r
-    s_rc.size.height = 14;\r
-    addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );\r
-    s_rc.origin.x = 486;\r
-    s_rc.origin.y = 64;\r
-    s_rc.size.width = 50;\r
-    addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );\r
-\r
-    return view;\r
-}\r
-\r
-- (void)dealloc\r
-{\r
-    [o_fs_timeSlider release];\r
-    [o_fs_volumeSlider release];\r
-    [o_prev release];\r
-    [o_next release];\r
-    [o_bwd release];\r
-    [o_play release];\r
-    [o_fwd release];\r
-    [o_fullscreen release];\r
-    [o_streamTitle_txt release];\r
-    [o_streamPosition_txt release];\r
-    [super dealloc];\r
-}\r
-\r
-- (void)setPlay\r
-{\r
-    [o_play setImage:[NSImage imageNamed:@"fs_play"]];\r
-    [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];\r
-}\r
-\r
-- (void)setPause\r
-{\r
-    [o_play setImage: [NSImage imageNamed:@"fs_pause"]];\r
-    [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];\r
-}\r
-\r
-- (void)setStreamTitle:(NSString *)o_title\r
-{\r
-    [o_streamTitle_txt setStringValue: o_title];\r
-}\r
-\r
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time\r
-{\r
-    [o_streamPosition_txt setStringValue: o_time];\r
-    [o_fs_timeSlider setFloatValue: f_pos];\r
-}\r
-\r
-- (void)setSeekable:(BOOL)b_seekable\r
-{\r
-    [o_bwd setEnabled: b_seekable];\r
-    [o_fwd setEnabled: b_seekable];\r
-    [o_fs_timeSlider setEnabled: b_seekable];\r
-}\r
-\r
-- (void)setVolumeLevel: (float)f_volumeLevel\r
-{\r
-    [o_fs_volumeSlider setFloatValue: f_volumeLevel];\r
-}\r
-\r
-- (IBAction)play:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] play: sender];\r
-}\r
-\r
-- (IBAction)forward:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] forward: sender];\r
-}\r
-\r
-- (IBAction)backward:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] backward: sender];\r
-}\r
-\r
-- (IBAction)prev:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] prev: sender];\r
-}\r
-\r
-- (IBAction)next:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] next: sender];\r
-}\r
-\r
-- (IBAction)windowAction:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] windowAction: sender];\r
-}\r
-\r
-- (IBAction)fsTimeSliderUpdate:(id)sender\r
-{\r
-    [[VLCMain sharedInstance] timesliderUpdate: sender];\r
-}\r
-\r
-- (IBAction)fsVolumeSliderUpdate:(id)sender\r
-{\r
-    [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender];\r
-}\r
-\r
-#define addImage(image, _x, _y, mode, _width)                                               \\r
-    img = [NSImage imageNamed:image];                                              \\r
-    image_rect.size = [img size];                                                           \\r
-    image_rect.origin.x = 0;                                                                \\r
-    image_rect.origin.y = 0;                                                                \\r
-    frame.origin.x = _x;                                                                    \\r
-    frame.origin.y = _y;                                                                    \\r
-    frame.size = [img size];                                                                \\r
-    if( _width ) frame.size.width = _width;                                                 \\r
-    [img drawInRect:frame fromRect:image_rect operation:mode fraction:1];\r
-\r
-- (void)drawRect:(NSRect)rect\r
-{\r
-    NSRect frame = [self frame];\r
-    NSRect image_rect;\r
-    NSImage *img;\r
-    addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );\r
-    addImage( @"fs_volume_slider_bar", 26, 22, NSCompositeSourceOver, 0 );\r
-    addImage( @"fs_volume_mute", 16, 18, NSCompositeSourceOver, 0 );\r
-    addImage( @"fs_volume_max", 124, 17, NSCompositeSourceOver, 0 );\r
-    addImage( @"fs_time_slider", 15, 53, NSCompositeSourceOver, 0);\r
-}\r
-\r
-@end\r
-\r
-/*****************************************************************************\r
- * VLCFSTimeSlider\r
- *****************************************************************************/\r
-@implementation VLCFSTimeSlider\r
-- (void)drawKnobInRect:(NSRect)knobRect\r
-{\r
-    NSRect image_rect;\r
-    NSImage *img = [NSImage imageNamed:@"fs_time_slider_knob_highlight"];\r
-    image_rect.size = [img size];\r
-    image_rect.origin.x = 0;\r
-    image_rect.origin.y = 0;\r
-    knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;\r
-    knobRect.size.width = image_rect.size.width;\r
-    knobRect.size.height = image_rect.size.height;\r
-    [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];\r
-}\r
-\r
-- (void)drawRect:(NSRect)rect\r
-{\r
-    /* Draw default to make sure the slider behaves correctly */\r
-    [[NSGraphicsContext currentContext] saveGraphicsState];\r
-    NSRectClip(NSZeroRect);\r
-    [super drawRect:rect];\r
-    [[NSGraphicsContext currentContext] restoreGraphicsState];\r
-    \r
-    NSRect knobRect = [[self cell] knobRectFlipped:NO];\r
-    knobRect.origin.y+=7.5;\r
-    [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];\r
-    [self drawKnobInRect: knobRect];\r
-}\r
-\r
-@end\r
-\r
-/*****************************************************************************\r
-* VLCFSVolumeSlider\r
-*****************************************************************************/\r
-@implementation VLCFSVolumeSlider\r
-- (void)drawKnobInRect:(NSRect) knobRect\r
-{\r
-    NSRect image_rect;\r
-    NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob"];\r
-    image_rect.size = [img size];\r
-    image_rect.origin.x = 0;\r
-    image_rect.origin.y = 0;\r
-    knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;\r
-    knobRect.size.width = image_rect.size.width;\r
-    knobRect.size.height = image_rect.size.height;\r
-    [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];\r
-}\r
-\r
-- (void)drawRect:(NSRect)rect\r
-{\r
-    /* Draw default to make sure the slider behaves correctly */\r
-    [[NSGraphicsContext currentContext] saveGraphicsState];\r
-    NSRectClip(NSZeroRect);\r
-    [super drawRect:rect];\r
-    [[NSGraphicsContext currentContext] restoreGraphicsState];\r
-    \r
-    NSRect knobRect = [[self cell] knobRectFlipped:NO];\r
-    knobRect.origin.y+=6;\r
-    [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];\r
-    [self drawKnobInRect: knobRect];\r
-}\r
-\r
-@end\r
-\r
+/*****************************************************************************
+ * fspanel.m: MacOS X full screen panel
+ *****************************************************************************
+ * Copyright (C) 2006-2008 the VideoLAN team
+ * $Id$
+ *
+ * Authors: Jérôme Decoodt <djc at videolan dot org>
+ *          Felix Paul Kühne <fkuehne at videolan dot org>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ *****************************************************************************/
+
+/*****************************************************************************
+ * Preamble
+ *****************************************************************************/
+#import "intf.h"
+#import "controls.h"
+#import "vout.h"
+#import "misc.h"
+#import "fspanel.h"
+
+/*****************************************************************************
+ * VLCFSPanel
+ *****************************************************************************/
+@implementation VLCFSPanel
+/* We override this initializer so we can set the NSBorderlessWindowMask styleMask, and set a few other important settings */
+- (id)initWithContentRect:(NSRect)contentRect 
+                styleMask:(unsigned int)aStyle 
+                  backing:(NSBackingStoreType)bufferingType 
+                    defer:(BOOL)flag
+{
+    id win = [super initWithContentRect:contentRect styleMask:NSTexturedBackgroundWindowMask backing:bufferingType defer:flag];
+    [win setOpaque:NO];
+    [win setHasShadow: NO];
+    [win setBackgroundColor:[NSColor clearColor]];
+    
+    /* let the window sit on top of everything else and start out completely transparent */
+    [win setLevel:NSModalPanelWindowLevel];
+    i_device = 0;
+    [win center];
+    [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];
+    if (isInside)
+        [self mouseEntered:NULL];
+    if (!isInside)
+        [self mouseExited:NULL];
+    
+    /* get a notification if VLC isn't the active app anymore */
+    [[NSNotificationCenter defaultCenter]
+    addObserver: self
+       selector: @selector(setNonActive:)
+           name: NSApplicationDidResignActiveNotification
+         object: NSApp];
+    
+    /* get a notification if VLC is the active app again */
+    [[NSNotificationCenter defaultCenter]
+    addObserver: self
+       selector: @selector(setActive:)
+           name: NSApplicationDidBecomeActiveNotification
+         object: NSApp];
+}
+
+/* Windows created with NSBorderlessWindowMask normally can't be key, but we want ours to be */
+- (BOOL)canBecomeKeyWindow
+{
+    return YES;
+}
+
+- (BOOL)mouseDownCanMoveWindow
+{
+    return YES;
+}
+
+-(void)dealloc
+{
+    [[NSNotificationCenter defaultCenter] removeObserver: self];
+    
+    if( hideAgainTimer )
+        [hideAgainTimer release];
+    [self setFadeTimer:nil];
+    [super dealloc];
+}
+
+-(void)center
+{
+    /* centre the panel in the lower third of the screen */
+    NSPoint theCoordinate;
+    NSRect theScreensFrame;
+    NSRect theWindowsFrame;
+    NSScreen *screen;
+    
+    /* user-defined screen */
+    screen = [NSScreen screenWithDisplayID: (CGDirectDisplayID)i_device];
+    
+    if (!screen)
+    {
+        /* invalid preferences or none specified, using main screen */
+        screen = [NSScreen mainScreen];
+    }
+
+    theScreensFrame = [screen frame];
+
+    theWindowsFrame = [self frame];
+    
+    theCoordinate.x = (theScreensFrame.size.width - theWindowsFrame.size.width) / 2 + theScreensFrame.origin.x;
+    theCoordinate.y = (theScreensFrame.size.height / 3) - theWindowsFrame.size.height + theScreensFrame.origin.y;
+    [self setFrameTopLeftPoint: theCoordinate];
+}
+
+- (void)setPlay
+{
+    [[self contentView] setPlay];
+}
+
+- (void)setPause
+{
+    [[self contentView] setPause];
+}
+
+- (void)setStreamTitle:(NSString *)o_title
+{
+    [[self contentView] setStreamTitle: o_title];
+}
+
+- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time
+{
+    [[self contentView] setStreamPos:f_pos andTime: o_time];
+}
+
+- (void)setSeekable:(BOOL) b_seekable
+{
+    [[self contentView] setSeekable: b_seekable];
+}
+
+- (void)setVolumeLevel: (float)f_volumeLevel
+{
+    [[self contentView] setVolumeLevel: f_volumeLevel];
+}
+
+- (void)setNonActive:(id)noData
+{
+    b_nonActive = YES;
+    [self orderOut: self];
+    
+    /* here's fadeOut, just without visibly fading */
+    b_displayed = NO;
+    [self setAlphaValue:0.0];
+    [self setFadeTimer:nil];
+    b_fadeQueued = NO;
+}
+
+- (void)setActive:(id)noData
+{
+    if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )
+    {
+        b_nonActive = NO;
+        [self fadeIn];
+    }
+}
+
+/* This routine is called repeatedly to fade in the window */
+- (void)focus:(NSTimer *)timer
+{
+    /* we need to push ourselves to front if the vout window was closed since our last display */
+    if( b_voutWasUpdated )
+    {
+        [self orderFront: self];
+        b_voutWasUpdated = NO;
+    }
+
+    if( [self alphaValue] < 1.0 )
+        [self setAlphaValue:[self alphaValue]+0.1];
+    if( [self alphaValue] >= 1.0 )
+    {
+        b_displayed = YES;
+        [self setAlphaValue: 1.0];
+        [self setFadeTimer:nil];
+        if( b_fadeQueued )
+        {
+            b_fadeQueued=NO;
+            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.1 target:self selector:@selector(unfocus:) userInfo:NULL repeats:YES]];
+        }
+    }
+}
+
+/* This routine is called repeatedly to hide the window */
+- (void)unfocus:(NSTimer *)timer
+{
+    if( b_keptVisible )
+    {
+        b_keptVisible = NO;
+        b_fadeQueued = NO;
+        [self setFadeTimer: NULL];
+        [self fadeIn];
+        return;
+    }
+    if( [self alphaValue] > 0.0 )
+        [self setAlphaValue:[self alphaValue]-0.05];
+    if( [self alphaValue] <= 0.05 )
+    {
+        b_displayed = NO;
+        [self setAlphaValue:0.0];
+        [self setFadeTimer:nil];
+        if( b_fadeQueued )
+        {
+            b_fadeQueued=NO;
+            [self setFadeTimer:
+                [NSTimer scheduledTimerWithTimeInterval:0.1 
+                                                 target:self 
+                                               selector:@selector(focus:) 
+                                               userInfo:NULL 
+                                                repeats:YES]];
+        }
+    }
+}
+
+- (void)mouseExited:(NSEvent *)theEvent
+{
+    /* give up our focus, so the vout may show us again without letting the user clicking it */
+    if( [[[[VLCMain sharedInstance] getControls] getVoutView] isFullscreen] )
+        [[[[[VLCMain sharedInstance] getControls] getVoutView] window] makeKeyWindow];
+}
+
+- (void)fadeIn
+{
+    /* in case that the user don't want us to appear, just return here */
+    if(! config_GetInt( VLCIntf, "macosx-fspanel" ) || b_nonActive )
+        return;
+    
+    [self orderFront: nil];
+    
+    if( [self alphaValue] < 1.0 || b_displayed != YES )
+    {
+        if (![self fadeTimer])
+            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(focus:) userInfo:[NSNumber numberWithShort:1] repeats:YES]];
+        else if ([[[self fadeTimer] userInfo] shortValue]==0)
+            b_fadeQueued=YES;
+    }
+    [self autoHide];
+}
+
+- (void)fadeOut
+{
+    if( NSPointInRect([NSEvent mouseLocation],[self frame]))
+        return;
+
+    if( ( [self alphaValue] > 0.0 ) )
+    {
+        if (![self fadeTimer])
+            [self setFadeTimer:[NSTimer scheduledTimerWithTimeInterval:0.05 target:self selector:@selector(unfocus:) userInfo:[NSNumber numberWithShort:0] repeats:YES]];
+        else if ([[[self fadeTimer] userInfo] shortValue]==1)
+            b_fadeQueued=YES;
+    }
+}
+
+/* triggers a timer to autoHide us again after some seconds of no activity */
+- (void)autoHide
+{
+    /* this will tell the timer to start over again or to start at all */
+    b_keptVisible = YES;
+    
+    /* get us a valid timer */
+    if(! b_alreadyCounting )
+    {
+        i_timeToKeepVisibleInSec = config_GetInt( VLCIntf, "mouse-hide-timeout" ) / 500;
+        hideAgainTimer = [NSTimer scheduledTimerWithTimeInterval: 0.5
+                                                          target: self 
+                                                        selector: @selector(keepVisible:)
+                                                        userInfo: nil 
+                                                         repeats: YES];
+        [hideAgainTimer fire];
+        [hideAgainTimer retain];
+        b_alreadyCounting = YES;
+    }
+}
+
+- (void)keepVisible:(NSTimer *)timer
+{
+    /* if the user triggered an action, start over again */
+    if( b_keptVisible )
+        b_keptVisible = NO;
+
+    /* count down until we hide ourselfes again and do so if necessary */
+    i_timeToKeepVisibleInSec -= 1;
+    if( i_timeToKeepVisibleInSec < 1 )
+    {
+        [NSCursor setHiddenUntilMouseMoves: YES];
+        [self fadeOut];
+        [timer invalidate];
+        [timer release];
+        b_alreadyCounting = NO;
+        timer = NULL;
+    }
+}
+
+/* A getter and setter for our main timer that handles window fading */
+- (NSTimer *)fadeTimer
+{
+    return fadeTimer;
+}
+
+- (void)setFadeTimer:(NSTimer *)timer
+{
+    [timer retain];
+    [fadeTimer invalidate];
+    [fadeTimer release];
+    fadeTimer=timer;
+}
+
+- (void)mouseDown:(NSEvent *)theEvent
+{
+    mouseClic = [theEvent locationInWindow];
+}
+
+- (void)mouseDragged:(NSEvent *)theEvent
+{
+    NSPoint point = [NSEvent mouseLocation];
+    point.x -= mouseClic.x;
+    point.y -= mouseClic.y;
+    [self setFrameOrigin:point];
+}
+
+- (BOOL)isDisplayed
+{
+    return b_displayed;
+}
+
+- (void)setVoutWasUpdated: (int)i_newdevice;
+{
+    b_voutWasUpdated = YES;
+    if( i_newdevice != i_device )
+    {
+        i_device = i_newdevice;
+        [self center];
+    }
+}
+@end
+
+/*****************************************************************************
+ * FSPanelView
+ *****************************************************************************/
+@implementation VLCFSPanelView
+
+#define addButton( o_button, imageOff, imageOn, _x, _y, action )                                \
+    s_rc.origin.x = _x;                                                                         \
+    s_rc.origin.y = _y;                                                                         \
+    o_button = [[NSButton alloc] initWithFrame: s_rc];                                 \
+    [o_button setButtonType: NSMomentaryChangeButton];                                          \
+    [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 sizeToFit];                                                                       \
+    [o_button setTarget: self];                                                                 \
+    [o_button setAction: @selector(action:)];                                                   \
+    [self addSubview:o_button];
+
+#define addTextfield( o_text, align, font, color, size )                                    \
+    o_text = [[NSTextField alloc] initWithFrame: s_rc];                            \
+    [o_text setDrawsBackground: NO];                                                        \
+    [o_text setBordered: NO];                                                               \
+    [o_text setEditable: NO];                                                               \
+    [o_text setSelectable: NO];                                                             \
+    [o_text setStringValue: _NS("(no item is being played)")];                                                    \
+    [o_text setAlignment: align];                                                           \
+    [o_text setTextColor: [NSColor color]];                                                 \
+    [o_text setFont:[NSFont font:[NSFont smallSystemFontSize] - size]];                     \
+    [self addSubview:o_text];
+
+- (id)initWithFrame:(NSRect)frameRect
+{
+    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 );
+    addButton( o_bwd, @"fs_rewind"        , @"fs_rewind_highlight"       , 211, 14, backward );
+    addButton( o_play, @"fs_play"          , @"fs_play_highlight"         , 267, 10, play );
+    addButton( o_fwd, @"fs_forward"       , @"fs_forward_highlight"      , 313, 14, forward );
+    addButton( o_next, @"fs_skip_next"     , @"fs_skip_next_highlight"    , 365, 15, next );
+    addButton( o_fullscreen, @"fs_exit_fullscreen", @"fs_exit_fullscreen_hightlight", 507, 13, windowAction );
+/*
+    addButton( o_button, @"image (off state)", @"image (on state)", 38, 51, something );
+ */
+
+    /* time slider */
+    s_rc = [self frame];
+    s_rc.origin.x = 15;
+    s_rc.origin.y = 53;
+    s_rc.size.width = 518;
+    s_rc.size.height = 9;
+    o_fs_timeSlider = [[VLCFSTimeSlider alloc] initWithFrame: s_rc];
+    [o_fs_timeSlider setMinValue:0];
+    [o_fs_timeSlider setMaxValue:10000];
+    [o_fs_timeSlider setFloatValue: 0];
+    [o_fs_timeSlider setContinuous: YES];
+    [o_fs_timeSlider setTarget: self];
+    [o_fs_timeSlider setAction: @selector(fsTimeSliderUpdate:)];
+    [self addSubview: o_fs_timeSlider];
+
+    /* volume slider */
+    s_rc = [self frame];
+    s_rc.origin.x = 26;
+    s_rc.origin.y = 17.5;
+    s_rc.size.width = 95;
+    s_rc.size.height = 10;
+    o_fs_volumeSlider = [[VLCFSVolumeSlider alloc] initWithFrame: s_rc];
+    [o_fs_volumeSlider setMinValue:0];
+    [o_fs_volumeSlider setMaxValue:32];
+    [o_fs_volumeSlider setFloatValue: 0];
+    [o_fs_volumeSlider setContinuous: YES];
+    [o_fs_volumeSlider setTarget: self];
+    [o_fs_volumeSlider setAction: @selector(fsVolumeSliderUpdate:)];
+    [self addSubview: o_fs_volumeSlider];
+    
+    /* time counter and stream title output fields */
+    s_rc = [self frame];
+    s_rc.origin.x = 98;
+    s_rc.origin.y = 64;
+    s_rc.size.width = 352;
+    s_rc.size.height = 14;
+    addTextfield( o_streamTitle_txt, NSCenterTextAlignment, systemFontOfSize, whiteColor, 0 );
+    s_rc.origin.x = 486;
+    s_rc.origin.y = 64;
+    s_rc.size.width = 50;
+    addTextfield( o_streamPosition_txt, NSRightTextAlignment, systemFontOfSize, whiteColor, 0 );
+
+    return view;
+}
+
+- (void)dealloc
+{
+    [o_fs_timeSlider release];
+    [o_fs_volumeSlider release];
+    [o_prev release];
+    [o_next release];
+    [o_bwd release];
+    [o_play release];
+    [o_fwd release];
+    [o_fullscreen release];
+    [o_streamTitle_txt release];
+    [o_streamPosition_txt release];
+    [super dealloc];
+}
+
+- (void)setPlay
+{
+    [o_play setImage:[NSImage imageNamed:@"fs_play"]];
+    [o_play setAlternateImage: [NSImage imageNamed:@"fs_play_highlight"]];
+}
+
+- (void)setPause
+{
+    [o_play setImage: [NSImage imageNamed:@"fs_pause"]];
+    [o_play setAlternateImage: [NSImage imageNamed:@"fs_pause_highlight"]];
+}
+
+- (void)setStreamTitle:(NSString *)o_title
+{
+    [o_streamTitle_txt setStringValue: o_title];
+}
+
+- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time
+{
+    [o_streamPosition_txt setStringValue: o_time];
+    [o_fs_timeSlider setFloatValue: f_pos];
+}
+
+- (void)setSeekable:(BOOL)b_seekable
+{
+    [o_bwd setEnabled: b_seekable];
+    [o_fwd setEnabled: b_seekable];
+    [o_fs_timeSlider setEnabled: b_seekable];
+}
+
+- (void)setVolumeLevel: (float)f_volumeLevel
+{
+    [o_fs_volumeSlider setFloatValue: f_volumeLevel];
+}
+
+- (IBAction)play:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] play: sender];
+}
+
+- (IBAction)forward:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] forward: sender];
+}
+
+- (IBAction)backward:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] backward: sender];
+}
+
+- (IBAction)prev:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] prev: sender];
+}
+
+- (IBAction)next:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] next: sender];
+}
+
+- (IBAction)windowAction:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] windowAction: sender];
+}
+
+- (IBAction)fsTimeSliderUpdate:(id)sender
+{
+    [[VLCMain sharedInstance] timesliderUpdate: sender];
+}
+
+- (IBAction)fsVolumeSliderUpdate:(id)sender
+{
+    [[[VLCMain sharedInstance] getControls] volumeSliderUpdated: sender];
+}
+
+#define addImage(image, _x, _y, mode, _width)                                               \
+    img = [NSImage imageNamed:image];                                              \
+    image_rect.size = [img size];                                                           \
+    image_rect.origin.x = 0;                                                                \
+    image_rect.origin.y = 0;                                                                \
+    frame.origin.x = _x;                                                                    \
+    frame.origin.y = _y;                                                                    \
+    frame.size = [img size];                                                                \
+    if( _width ) frame.size.width = _width;                                                 \
+    [img drawInRect:frame fromRect:image_rect operation:mode fraction:1];
+
+- (void)drawRect:(NSRect)rect
+{
+    NSRect frame = [self frame];
+    NSRect image_rect;
+    NSImage *img;
+    addImage( @"fs_background", 0, 0, NSCompositeCopy, 0 );
+    addImage( @"fs_volume_slider_bar", 26, 22, NSCompositeSourceOver, 0 );
+    addImage( @"fs_volume_mute", 16, 18, NSCompositeSourceOver, 0 );
+    addImage( @"fs_volume_max", 124, 17, NSCompositeSourceOver, 0 );
+    addImage( @"fs_time_slider", 15, 53, NSCompositeSourceOver, 0);
+}
+
+@end
+
+/*****************************************************************************
+ * VLCFSTimeSlider
+ *****************************************************************************/
+@implementation VLCFSTimeSlider
+- (void)drawKnobInRect:(NSRect)knobRect
+{
+    NSRect image_rect;
+    NSImage *img = [NSImage imageNamed:@"fs_time_slider_knob_highlight"];
+    image_rect.size = [img size];
+    image_rect.origin.x = 0;
+    image_rect.origin.y = 0;
+    knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;
+    knobRect.size.width = image_rect.size.width;
+    knobRect.size.height = image_rect.size.height;
+    [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
+}
+
+- (void)drawRect:(NSRect)rect
+{
+    /* Draw default to make sure the slider behaves correctly */
+    [[NSGraphicsContext currentContext] saveGraphicsState];
+    NSRectClip(NSZeroRect);
+    [super drawRect:rect];
+    [[NSGraphicsContext currentContext] restoreGraphicsState];
+    
+    NSRect knobRect = [[self cell] knobRectFlipped:NO];
+    knobRect.origin.y+=7.5;
+    [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
+    [self drawKnobInRect: knobRect];
+}
+
+@end
+
+/*****************************************************************************
+* VLCFSVolumeSlider
+*****************************************************************************/
+@implementation VLCFSVolumeSlider
+- (void)drawKnobInRect:(NSRect) knobRect
+{
+    NSRect image_rect;
+    NSImage *img = [NSImage imageNamed:@"fs_volume_slider_knob"];
+    image_rect.size = [img size];
+    image_rect.origin.x = 0;
+    image_rect.origin.y = 0;
+    knobRect.origin.x += (knobRect.size.width - image_rect.size.width) / 2;
+    knobRect.size.width = image_rect.size.width;
+    knobRect.size.height = image_rect.size.height;
+    [img drawInRect:knobRect fromRect:image_rect operation:NSCompositeSourceOver fraction:1];
+}
+
+- (void)drawRect:(NSRect)rect
+{
+    /* Draw default to make sure the slider behaves correctly */
+    [[NSGraphicsContext currentContext] saveGraphicsState];
+    NSRectClip(NSZeroRect);
+    [super drawRect:rect];
+    [[NSGraphicsContext currentContext] restoreGraphicsState];
+    
+    NSRect knobRect = [[self cell] knobRectFlipped:NO];
+    knobRect.origin.y+=6;
+    [[[NSColor blackColor] colorWithAlphaComponent:0.6] set];
+    [self drawKnobInRect: knobRect];
+}
+
+@end
+