macosx: Fix controller playlist toggling to use the contentRect and not the window...

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

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