activex; sync test.html testpage with mozilla one.

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

diff --git a/modules/gui/macosx/controls.h b/modules/gui/macosx/controls.h
index 4af6fec0bab90fc7c6c3c498ca35b784b8a7a78e..0522a1bea502854c602121cc56fb799af2e08aa9 100644 (file)
--- a/modules/gui/macosx/controls.h
+++ b/modules/gui/macosx/controls.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * controls.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * 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 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
@@ -33,12 +33,15 @@
 {
     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;
+    
+    NSImage * o_repeat_single;
+    NSImage * o_repeat_all;
+    NSImage * o_repeat_off;
 
     IBOutlet id o_specificTime_cancel_btn;
     IBOutlet id o_specificTime_enter_fld;
@@ -51,6 +54,9 @@
 
     VLCFSPanel *o_fs_panel;
 }
+- (void)controlTintChanged;
+
+- (id)voutView;
 
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
@@ -80,20 +86,25 @@
 
 - (IBAction)showPosition: (id)sender;
 - (IBAction)toogleFullscreen:(id)sender;
-- (BOOL) isFullscreen;
+- (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)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;
 
@@ -103,28 +114,6 @@
 
 @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
  *****************************************************************************