X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=modules%2Fgui%2Fmacosx%2Ffspanel.h;h=1a38d89b6fee174674548dec711914e8326a3052;hb=1c8685fb7d890424ec06ff9a2e3cbc1da984e617;hp=31bfe25ff4a6c62e76a0b31bf89a5ddb50db55bd;hpb=21445d780fe5e8a1ed786bdb15aaebca46b6841d;p=vlc

diff --git a/modules/gui/macosx/fspanel.h b/modules/gui/macosx/fspanel.h
index 31bfe25ff4..1a38d89b6f 100644
--- a/modules/gui/macosx/fspanel.h
+++ b/modules/gui/macosx/fspanel.h
@@ -1,17 +1,17 @@
 /*****************************************************************************
  * fspanel.h: MacOS X full screen panel
  *****************************************************************************
- * Copyright (C) 2006 the VideoLAN team
+ * Copyright (C) 2006-2007 the VideoLAN team
  * $Id$
  *
- * Authors: JŽr™me Decoodt <djc at videolan dot org>
- *          Felix KŸhne <fkuehne at videolan dot org>
+ * Authors: Jérôme Decoodt <djc at videolan dot org>
+ *          Felix 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
@@ -31,11 +31,13 @@
     BOOL b_alreadyCounting;
     int i_timeToKeepVisibleInSec;
 
+    BOOL b_nonActive;
     BOOL b_displayed;
     BOOL b_voutWasUpdated;
+    int i_device;
 }
-- (id)initWithContentRect: (NSRect)contentRect 
-                styleMask: (unsigned int)aStyle 
+- (id)initWithContentRect: (NSRect)contentRect
+                styleMask: (unsigned int)aStyle
                   backing: (NSBackingStoreType)bufferingType
                     defer: (BOOL)flag;
 - (void)awakeFromNib;
@@ -44,68 +46,71 @@
 
 - (void)setPlay;
 - (void)setPause;
-- (void)setStreamTitle:(NSString *)o_title;
-- (void)setStreamPos:(float) f_pos andTime:(NSString *)o_time;
-- (void)setSeekable:(BOOL) b_seekable;
+- (void)setStreamTitle: (NSString *)o_title;
+- (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
+- (void)setSeekable: (BOOL)b_seekable;
 - (void)setVolumeLevel: (float)f_volumeLevel;
 
-- (void)focus:(NSTimer *)timer;
-- (void)unfocus:(NSTimer *)timer;
-- (void)mouseExited:(NSEvent *)theEvent;
+- (void)setNonActive: (id)noData;
+- (void)setActive: (id)noData;
+
+- (void)focus: (NSTimer *)timer;
+- (void)unfocus: (NSTimer *)timer;
+- (void)mouseExited: (NSEvent *)theEvent;
 
 - (void)fadeIn;
 - (void)fadeOut;
 
 - (NSTimer *)fadeTimer;
-- (void)setFadeTimer:(NSTimer *)timer;
+- (void)setFadeTimer: (NSTimer *)timer;
 - (void)autoHide;
-- (void)keepVisible:(NSTimer *)timer;
+- (void)keepVisible: (NSTimer *)timer;
 
-- (void)mouseDown:(NSEvent *)theEvent;
-- (void)mouseDragged:(NSEvent *)theEvent;
+- (void)mouseDown: (NSEvent *)theEvent;
+- (void)mouseDragged: (NSEvent *)theEvent;
 
 - (BOOL)isDisplayed;
-- (void)setVoutWasUpdated;
+- (void)setVoutWasUpdated: (int)i_screen;
 @end
 
 @interface VLCFSPanelView : NSView
 {
     NSColor *fillColor;
-    NSButton *o_prev, *o_next, *o_slow, *o_fast, *o_play, *o_fullscreen;
+    NSButton *o_prev, *o_next, *o_bwd, *o_fwd, *o_play, *o_fullscreen;
     NSTextField *o_streamTitle_txt, *o_streamPosition_txt;
     NSSlider *o_fs_timeSlider, *o_fs_volumeSlider;
 }
-- (id)initWithFrame:(NSRect)frameRect;
-- (void)drawRect:(NSRect)rect;
+- (id)initWithFrame: (NSRect)frameRect;
+- (void)drawRect: (NSRect)rect;
 
 - (void)setPlay;
 - (void)setPause;
 - (void)setStreamTitle: (NSString *)o_title;
 - (void)setStreamPos: (float)f_pos andTime: (NSString *)o_time;
-- (void)setSeekable: (BOOL)b_seekable; 
+- (void)setSeekable: (BOOL)b_seekable;
 - (void)setVolumeLevel: (float)f_volumeLevel;
 - (IBAction)play:(id)sender;
 - (IBAction)prev:(id)sender;
 - (IBAction)next:(id)sender;
-- (IBAction)faster:(id)sender;
-- (IBAction)slower:(id)sender;
-- (IBAction)fsTimeSliderUpdate:(id)sender;
-- (IBAction)fsVolumeSliderUpdate:(id)sender;
+- (IBAction)forward:(id)sender;
+- (IBAction)backward:(id)sender;
+- (IBAction)fsTimeSliderUpdate: (id)sender;
+- (IBAction)fsVolumeSliderUpdate: (id)sender;
 
 @end
 
 @interface VLCFSTimeSlider : NSSlider
 {
 }
-- (void)drawKnobInRect:(NSRect)knobRect;
-- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect: (NSRect)knobRect;
+- (void)drawRect: (NSRect)rect;
 
 @end
 
 @interface VLCFSVolumeSlider : NSSlider
 {
 }
-- (void)drawKnobInRect:(NSRect)knobRect;
-- (void)drawRect:(NSRect)rect;
+- (void)drawKnobInRect: (NSRect)knobRect;
+- (void)drawRect: (NSRect)rect;
 
 @end