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 1fc0573f6eb55e3c7b27f74d6ac96838427f7a44..b6c15093600791dbc537f7c9e2bf28e35cc2c424 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-2007 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,17 @@
 {
     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;
@@ -51,6 +56,9 @@
 
     VLCFSPanel *o_fs_panel;
 }
+- (void)controlTintChanged;
+
+- (id)voutView;
 
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
@@ -80,8 +88,13 @@
 
 - (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;
 
@@ -99,30 +112,30 @@
 
 - (IBAction)goToSpecificTime:(id)sender;
 
-- (id)getFSPanel;
+- (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