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 9161a2ac26d175b7f67a19d4fba5bd68d5cca9c0..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
@@ -38,6 +38,8 @@
     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;
@@ -56,7 +58,7 @@
 }
 - (void)controlTintChanged;
 
-- (id)getVoutView;
+- (id)voutView;
 
 - (IBAction)play:(id)sender;
 - (IBAction)stop:(id)sender;
@@ -86,11 +88,12 @@
 
 - (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;
@@ -109,7 +112,31 @@
 
 - (IBAction)goToSpecificTime:(id)sender;
 
-- (id)getFSPanel;
+- (id)fspanel;
+
+@end
+
+/*****************************************************************************
+ * VLCAutoGeneratedMenuContent interface
+ *****************************************************************************
+ * This holds our data for autogenerated menus
+ *****************************************************************************/
+@interface VLCAutoGeneratedMenuContent : NSObject
+{
+    char *psz_name;
+    vlc_object_t * _vlc_object;
+    vlc_value_t value;
+    int i_type;
+}
+
+- (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