macosx: hide playmode buttons by default

[vlc] / modules / gui / macosx / fspanel.h

diff --git a/modules/gui/macosx/fspanel.h b/modules/gui/macosx/fspanel.h
index 878509d9d3886536e3f3678e6f0915ae3821838f..56bd4b05a6ae00d62bdb12f94850b280c083e49c 100644 (file)
--- a/modules/gui/macosx/fspanel.h
+++ b/modules/gui/macosx/fspanel.h
@@ -1,11 +1,12 @@
 /*****************************************************************************
  * fspanel.h: MacOS X full screen panel
  *****************************************************************************
- * Copyright (C) 2006-2011 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
@@ -22,6 +23,8 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+@class VLCWindow;
+
 @interface VLCFSPanel : NSWindow
 {
     NSTimer *fadeTimer,*hideAgainTimer;
@@ -36,7 +39,7 @@
     BOOL b_voutWasUpdated;
     int i_device;
 
-    BOOL b_usingBigScreen;
+    VLCWindow *o_vout_window;
 }
 - (id)initWithContentRect: (NSRect)contentRect
                 styleMask: (NSUInteger)aStyle
@@ -49,9 +52,9 @@
 - (void)setPlay;
 - (void)setPause;
 - (void)setStreamTitle: (NSString *)o_title;
-- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
+- (void)updatePositionAndTime;
 - (void)setSeekable: (BOOL)b_seekable;
-- (void)setVolumeLevel: (float)f_volumeLevel;
+- (void)setVolumeLevel: (int)i_volumeLevel;
 
 - (void)setNonActive: (id)noData;
 - (void)setActive: (id)noData;
@@ -71,19 +74,22 @@
 - (void)mouseDown: (NSEvent *)theEvent;
 - (void)mouseDragged: (NSEvent *)theEvent;
 
-- (BOOL)isDisplayed;
-- (void)setVoutWasUpdated: (int)i_screen;
-- (void)adaptWindowSizeToScreen;
+- (void)setVoutWasUpdated: (VLCWindow *)o_window;
 @end
 
+@class VLCProgressView;
+
 @interface VLCFSPanelView : NSView
 {
     NSColor *fillColor;
     NSButton *o_prev, *o_next, *o_bwd, *o_fwd, *o_play, *o_fullscreen;
-    NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
+    NSTextField *o_streamTitle_txt;
+    VLCTimeField *o_streamPosition_txt, *o_streamLength_txt;
     NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
-
-    BOOL b_usingBigScreen;
+    VLCProgressView *o_progress_view;
+    NSImage *o_background_img, *o_vol_sld_img, *o_vol_mute_img, *o_vol_max_img, *o_time_sld_img;
+    NSTimeInterval last_fwd_event;
+    NSTimeInterval last_bwd_event;
 }
 - (id)initWithFrame: (NSRect)frameRect;
 - (void)drawRect: (NSRect)rect;
@@ -91,9 +97,9 @@
 - (void)setPlay;
 - (void)setPause;
 - (void)setStreamTitle: (NSString *)o_title;
-- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
+- (void)updatePositionAndTime;
 - (void)setSeekable: (BOOL)b_seekable;
-- (void)setVolumeLevel: (float)f_volumeLevel;
+- (void)setVolumeLevel: (int)i_volumeLevel;
 - (IBAction)play:(id)sender;
 - (IBAction)prev:(id)sender;
 - (IBAction)next:(id)sender;
@@ -101,7 +107,6 @@
 - (IBAction)backward:(id)sender;
 - (IBAction)fsTimeSliderUpdate: (id)sender;
 - (IBAction)fsVolumeSliderUpdate: (id)sender;
-- (void)adaptViewSizeToScreen: (BOOL)b_value;
 
 @end
 
@@ -113,7 +118,7 @@
 
 @end
 
-@interface VLCFSVolumeSlider : NSSlider
+@interface VLCFSVolumeSlider : VLCVolumeSliderCommon
 {
 }
 - (void)drawKnobInRect: (NSRect)knobRect;