macosx: merge Eric Dudiak's code from GSoC 2008

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

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index b40a926216da774c9de69587e06debad79f789b7..b6c15093600791dbc537f7c9e2bf28e35cc2c424 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -1,18 +1,19 @@
 /*****************************************************************************
- * controls.h: MacOS X interface plugin
+ * controls.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2003 VideoLAN
- * $Id: controls.h,v 1.8 2003/12/11 19:34:47 hartman Exp $
+ * Copyright (C) 2002-2009 the VideoLAN team
+ * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <thedj@users.sourceforge.net>
+ *          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
  * 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
@@ -20,20 +21,44 @@
  *
  * 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., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#import "fspanel.h"
+
 /*****************************************************************************
- * VLCControls interface 
+ * VLCControls interface
  *****************************************************************************/
 @interface VLCControls : NSObject
 {
-    IBOutlet id o_open;
     IBOutlet id o_main;
 
-    IBOutlet id o_btn_fullscreen;
     IBOutlet id o_volumeslider;
+
+    IBOutlet id o_btn_shuffle;
+    IBOutlet id o_btn_addNode;
+    IBOutlet id o_btn_repeat;
+    IBOutlet id o_btn_repeat_embed;
+    IBOutlet id o_btn_shuffle_embed;
+    
+    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;
+    IBOutlet id o_specificTime_ok_btn;
+    IBOutlet id o_specificTime_win;
+    IBOutlet id o_specificTime_sec_lbl;
+    IBOutlet id o_specificTime_stepper;
+    IBOutlet id o_specificTime_mi;
+
+    VLCFSPanel *o_fs_panel;
 }
+- (void)controlTintChanged;
+
+- (id)voutView;
 
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
@@ -45,6 +70,13 @@
 - (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)forward:(id)sender;
 - (IBAction)backward:(id)sender;
@@ -53,42 +85,69 @@
 - (IBAction)volumeDown:(id)sender;
 - (IBAction)mute:(id)sender;
 - (IBAction)volumeSliderUpdated:(id)sender;
-- (void)updateVolumeSlider;
 
+- (IBAction)showPosition: (id)sender;
+- (IBAction)toogleFullscreen:(id)sender;
+- (BOOL)isFullscreen;
 - (IBAction)windowAction:(id)sender;
 
+- (IBAction)telxTransparent:(id)sender;
+- (IBAction)telxNavLink:(id)sender;
+- (IBAction)addSubtitleFile:(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;
+                  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;
+         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)goToSpecificTime:(id)sender;
+
+- (id)fspanel;
+
 @end
 
 /*****************************************************************************
- * VLCMenuExt interface 
+ * VLCAutoGeneratedMenuContent interface
  *****************************************************************************
  * This holds our data for autogenerated menus
  *****************************************************************************/
-@interface VLCMenuExt : NSObject
+@interface VLCAutoGeneratedMenuContent : NSObject
 {
     char *psz_name;
-    int i_object_id;
+    vlc_object_t * _vlc_object;
     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;
+- (id)initWithVariableName: (const char *)name 
+                  ofObject: (vlc_object_t *)object
+                  andValue: (vlc_value_t)value 
+                    ofType: (int)type;
+- (const char *)name;
 - (vlc_value_t)value;
+- (vlc_object_t *)vlcObject;
 - (int)type;
 
 @end
+
+/*****************************************************************************
+ * VLCTimeField interface
+ *****************************************************************************
+ * we need the implementation to catch our click-event in the controller window
+ *****************************************************************************/
+
+@interface VLCTimeField : NSTextField
+{
+}
+@end
+