macosx: properly synchronize goto stepper / field values

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

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index e077716b354df8d241027575620dca2a097b7f0f..8df133cb46a8386318e56b629dce36f95c34c01d 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -1,13 +1,12 @@
 /*****************************************************************************
  * controls.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2007 the VideoLAN team
+ * Copyright (C) 2002-2012 VLC authors and VideoLAN
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
- *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
- *          Felix Kühne <fkuehne at videolan org>
+ *          Felix Paul Kühne <fkuehne at videolan 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
@@ -24,8 +23,6 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#import "fspanel.h"
-
 /*****************************************************************************
  * VLCControls interface
  *****************************************************************************/
@@ -33,16 +30,6 @@
 {
     IBOutlet id o_main;
 
-    IBOutlet id o_volumeslider;
-
-    IBOutlet id o_btn_shuffle;
-    IBOutlet id o_btn_addNode;
-    IBOutlet id o_btn_repeat;
-    
-    NSImage * o_repeat_single;
-    NSImage * o_repeat_all;
-    NSImage * o_repeat_off;
-
     IBOutlet id o_specificTime_cancel_btn;
     IBOutlet id o_specificTime_enter_fld;
     IBOutlet id o_specificTime_goTo_lbl;
@@ -51,96 +38,34 @@
     IBOutlet id o_specificTime_sec_lbl;
     IBOutlet id o_specificTime_stepper;
     IBOutlet id o_specificTime_mi;
-
-    VLCFSPanel *o_fs_panel;
 }
-- (void)controlTintChanged;
+
+@property (nonatomic) int jumpTimeValue;
 
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
-- (IBAction)faster:(id)sender;
-- (IBAction)slower:(id)sender;
 
 - (IBAction)prev:(id)sender;
 - (IBAction)next:(id)sender;
 - (IBAction)random:(id)sender;
 - (IBAction)repeat:(id)sender;
 - (IBAction)loop:(id)sender;
-- (IBAction)repeatButtonAction:(id)sender;
-
-/* the three ugly helpers again */
-- (void)repeatOne;
-- (void)repeatAll;
-- (void)repeatOff;
-- (void)shuffle;
+- (IBAction)quitAfterPlayback:(id)sender;
 
 - (IBAction)forward:(id)sender;
 - (IBAction)backward:(id)sender;
 
-- (id)getVoutView;
-
 - (IBAction)volumeUp:(id)sender;
 - (IBAction)volumeDown:(id)sender;
 - (IBAction)mute:(id)sender;
 - (IBAction)volumeSliderUpdated:(id)sender;
 
 - (IBAction)showPosition: (id)sender;
-- (IBAction)toogleFullscreen:(id)sender;
-- (BOOL) isFullscreen;
-- (IBAction)windowAction:(id)sender;
-- (BOOL)keyEvent:(NSEvent *)o_event;
-- (void)scrollWheel: (NSEvent *)theEvent;
 
-- (void)setupVarMenuItem:(NSMenuItem *)o_mi
-                  target:(vlc_object_t *)p_object
-                     var:(const char *)psz_variable
-                selector:(SEL)pf_callback;
-- (void)setupVarMenu:(NSMenu *)o_menu
-         forMenuItem: (NSMenuItem *)o_parent
-              target:(vlc_object_t *)p_object
-                 var:(const char *)psz_variable
-            selector:(SEL)pf_callback;
-- (IBAction)toggleVar:(id)sender;
-- (int)toggleVarThread:(id)_o_data;
+- (IBAction)lockVideosAspectRatio:(id)sender;
 
-- (IBAction)goToSpecificTime:(id)sender;
-
-- (id)getFSPanel;
-
-@end
-
-/*****************************************************************************
- * VLCMenuExt interface
- *****************************************************************************
- * This holds our data for autogenerated menus
- *****************************************************************************/
-@interface VLCMenuExt : NSObject
-{
-    char *psz_name;
-    int i_object_id;
-    vlc_value_t value;
-    int i_type;
-}
-
-- (id)initWithVar: (const char *)_psz_name 
-           Object: (int)i_id
-            Value: (vlc_value_t)val 
-           ofType: (int)_i_type;
-- (char *)name;
-- (int)objectID;
-- (vlc_value_t)value;
-- (int)type;
-
-@end
-
-/*****************************************************************************
- * VLCTimeField interface
- *****************************************************************************
- * we need the implementation to catch our click-event in the controller window
- *****************************************************************************/
+- (BOOL)keyEvent:(NSEvent *)o_event;
 
-@interface VLCTimeField : NSTextField
-{
-}
+- (IBAction)goToSpecificTime:(id)sender;
 @end