macosx: GUI demo of Simple Preferences showing the Interface and Audio categories...

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 91555d9aa4128b4e3688ca5cae8e1de3e9240d0c..21dd711a545a2d0eda7529b9de1c51b746627200 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -1,13 +1,13 @@
 /*****************************************************************************
  * intf.h: MacOS X interface module
  *****************************************************************************
- * Copyright (C) 2002-2006 the VideoLAN team
+ * Copyright (C) 2002-2007 the VideoLAN team
  * $Id$
  *
  * Authors: Jon Lech Johansen <jon-vl@nanocrew.net>
  *          Christophe Massiot <massiot@via.ecp.fr>
  *          Derk-Jan Hartman <hartman at videolan dot org>
- *          Felix K\9fhne <fkuehne at videolan dot org>
+ *          Felix Kühne <fkuehne at videolan dot 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,6 +24,10 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
 #include <vlc/vlc.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
@@ -93,6 +97,7 @@ struct intf_sys_t
 {
     intf_thread_t *p_intf;      /* The main intf object */
     id o_prefs;                 /* VLCPrefs       */
+    id o_sprefs;                /* VLCSimplePrefs */
     id o_about;                 /* VLAboutBox     */
     id o_open;                  /* VLCOpen        */
     id o_wizard;                /* VLCWizard      */
@@ -101,15 +106,19 @@ struct intf_sys_t
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
     id o_sfilters;              /* VLCsFilters    */
+#ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
-    BOOL nib_main_loaded;       /* reference to the main-nib */
-    BOOL nib_open_loaded;       /* reference to the open-nib */
-    BOOL nib_about_loaded;      /* reference to the about-nib */
-    BOOL nib_wizard_loaded;     /* reference to the wizard-nib */
-    BOOL nib_extended_loaded;   /* reference to the extended-nib */
-    BOOL nib_bookmarks_loaded;  /* reference to the bookmarks-nib */
-    BOOL nib_sfilters_loaded;   /* reference to the sfilters-nib */
-    BOOL nib_update_loaded;     /* reference to the update-nib */
+#endif
+    id o_eyetv;                 /* VLCEyeTVController */
+    BOOL nib_main_loaded;       /* main nibfile */
+    BOOL nib_open_loaded;       /* open nibfile */
+    BOOL nib_about_loaded;      /* about nibfile */
+    BOOL nib_wizard_loaded;     /* wizard nibfile */
+    BOOL nib_extended_loaded;   /* extended nibfile */
+    BOOL nib_bookmarks_loaded;  /* bookmarks nibfile */
+    BOOL nib_sfilters_loaded;   /* sfilters nibfile */
+    BOOL nib_prefs_loaded;      /* preferences nibfile */
+    BOOL nib_update_loaded;     /* update nibfile */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -121,15 +130,16 @@ struct intf_sys_t
     float f_slider_old;         /* old slider val */
     IBOutlet id o_volumeslider; /* volume slider  */
 
-    IBOutlet id o_main_pgbar;   /* main interface progress bar */
+    IBOutlet id o_main_pgbar;   /* playlist window progress bar */
     IBOutlet id o_btn_prev;     /* btn previous   */
     IBOutlet id o_btn_rewind;   /* btn rewind     */
     IBOutlet id o_btn_play;     /* btn play       */
     IBOutlet id o_btn_stop;     /* btn stop       */
     IBOutlet id o_btn_ff;       /* btn fast forward     */
     IBOutlet id o_btn_next;     /* btn next       */
-    IBOutlet id o_btn_fullscreen;/* btn fullscreen      */
+    IBOutlet id o_btn_fullscreen;/* btn fullscreen (embedded vout window) */
     IBOutlet id o_btn_playlist; /* btn playlist   */
+    IBOutlet id o_btn_equalizer; /* eq btn */
 
     NSImage * o_img_play;       /* btn play img   */
     NSImage * o_img_pause;      /* btn pause img  */
@@ -152,6 +162,7 @@ struct intf_sys_t
 
     IBOutlet id o_mi_about;
     IBOutlet id o_mi_prefs;
+    IBOutlet id o_mi_sprefs;
     IBOutlet id o_mi_checkForUpdate;
     IBOutlet id o_mi_add_intf;
     IBOutlet id o_mu_add_intf;
@@ -249,11 +260,11 @@ struct intf_sys_t
     IBOutlet id o_mi_bring_atf;
 
     IBOutlet id o_mu_help;
+    IBOutlet id o_mi_help;
     IBOutlet id o_mi_readme;
     IBOutlet id o_mi_documentation;
-    IBOutlet id o_mi_reportabug;
-    IBOutlet id o_mi_website;
     IBOutlet id o_mi_license;
+    IBOutlet id o_mi_website;
     IBOutlet id o_mi_donation;
     IBOutlet id o_mi_forum;
     IBOutlet id o_mi_errorsAndWarnings;
@@ -279,6 +290,9 @@ struct intf_sys_t
 
     bool b_small_window;
 
+    bool b_restore_size;
+    NSRect o_restore_rect;
+
     mtime_t i_end_scroll;
 
     NSSize o_size_with_playlist;
@@ -294,7 +308,11 @@ struct intf_sys_t
 - (intf_thread_t *)getIntf;
 - (void)setIntf:(intf_thread_t *)p_mainintf;
 
+- (void)controlTintChanged;
+
 - (id)getControls;
+- (id)getSimplePreferences;
+- (id)getPreferences;
 - (id)getPlaylist;
 - (id)getInfo;
 - (id)getWizard;
@@ -304,8 +322,9 @@ struct intf_sys_t
 - (id)getMainIntfPgbar;
 - (id)getControllerWindow;
 - (id)getVoutMenu;
-- (void)terminate;
-- (NSString *)localizedString:(char *)psz;
+- (id)getEyeTVController;
+- (void)applicationWillTerminate:(NSNotification *)notification;
+- (NSString *)localizedString:(const char *)psz;
 - (char *)delocalizeString:(NSString *)psz;
 - (NSString *)wrapString: (NSString *)o_in_string toWidth: (int)i_width;
 - (BOOL)hasDefinedShortcutKey:(NSEvent *)o_event;
@@ -315,6 +334,7 @@ struct intf_sys_t
 - (void)manage;
 - (void)manageIntf:(NSTimer *)o_timer;
 - (void)setupMenus;
+- (void)refreshVoutDeviceMenu:(NSNotification *)o_notification;
 - (void)setScrollField:(NSString *)o_string stopAfter:(int )timeout;
 - (void)resetScrollField;
 
@@ -338,13 +358,13 @@ struct intf_sys_t
 - (IBAction)showSFilters:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
+- (IBAction)showLicense:(id)sender;
 - (IBAction)viewPreferences:(id)sender;
 - (IBAction)checkForUpdate:(id)sender;
+- (IBAction)viewHelp:(id)sender;
 - (IBAction)openReadMe:(id)sender;
 - (IBAction)openDocumentation:(id)sender;
-- (IBAction)reportABug:(id)sender;
 - (IBAction)openWebsite:(id)sender;
-- (IBAction)openLicense:(id)sender;
 - (IBAction)openForum:(id)sender;
 - (IBAction)openDonate:(id)sender;
 - (IBAction)openCrashLog:(id)sender;