Redesign the Capture Device panel

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index 7e75880cdae170a3cf484031d38e8cbaf17b487e..91f7730ef67cc0be346cc352e62251d4bd9f39a9 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-2007 the VideoLAN team
+ * Copyright (C) 2002-2008 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ühne <fkuehne at videolan dot org>
+ *          Felix Paul 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,7 +24,11 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
-#include <vlc/vlc.h>
+#ifdef HAVE_CONFIG_H
+#   include "config.h"
+#endif
+
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>
@@ -33,6 +37,12 @@
 
 #include <Cocoa/Cocoa.h>
 
+/* this was introduced in Darwin 9. We need to declare it to prevent both
+ * compilation warnings and errors */
+#ifndef NSInteger
+#define NSInteger int
+#endif
+
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
@@ -63,22 +73,22 @@ struct intf_sys_t
     input_thread_t * p_input;
 
     /* special actions */
-    vlc_bool_t b_mute;
+    bool b_mute;
     int i_play_status;
 
     /* interface update */
-    vlc_bool_t b_intf_update;
-    vlc_bool_t b_playlist_update;
-    vlc_bool_t b_playmode_update;
-    vlc_bool_t b_current_title_update;
-    vlc_bool_t b_fullscreen_update;
-    vlc_bool_t b_volume_update;
-    vlc_bool_t b_intf_show;
+    bool b_intf_update;
+    bool b_playlist_update;
+    bool b_playmode_update;
+    bool b_current_title_update;
+    bool b_fullscreen_update;
+    bool b_volume_update;
+    bool b_intf_show;
 
     /* menus handlers */
-    vlc_bool_t b_input_update;
-    vlc_bool_t b_aout_update;
-    vlc_bool_t b_vout_update;
+    bool b_input_update;
+    bool b_aout_update;
+    bool b_vout_update;
 
     /* The messages window */
     msg_subscription_t * p_sub;
@@ -93,6 +103,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,6 +112,7 @@ struct intf_sys_t
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
     id o_sfilters;              /* VLCsFilters    */
+    id o_info;                  /* VLCInformation */
 #ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
 #endif
@@ -112,7 +124,9 @@ struct intf_sys_t
     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 */
+    BOOL nib_info_loaded;       /* information panel nibfile */
 
     IBOutlet id o_window;       /* main window    */
     IBOutlet id o_playlist_view;/* playlist view  */
@@ -133,6 +147,7 @@ struct intf_sys_t
     IBOutlet id o_btn_next;     /* btn next       */
     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  */
@@ -141,7 +156,6 @@ struct intf_sys_t
 
     IBOutlet id o_controls;     /* VLCControls    */
     IBOutlet id o_playlist;     /* VLCPlaylist    */
-    IBOutlet id o_info;         /* VLCInfo        */
 
     IBOutlet id o_messages;     /* messages tv    */
     IBOutlet id o_msgs_panel;   /* messages panel */
@@ -149,12 +163,11 @@ struct intf_sys_t
     NSLock * o_msg_lock;        /* messages lock  */
     IBOutlet id o_msgs_btn_crashlog;    /* messages open crashlog */
 
-    IBOutlet id o_info_window;  /* Info panel     */
-
     /* main menu */
 
     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;
@@ -169,6 +182,7 @@ struct intf_sys_t
     IBOutlet id o_mi_open_generic;
     IBOutlet id o_mi_open_disc;
     IBOutlet id o_mi_open_net;
+    IBOutlet id o_mi_open_capture;
     IBOutlet id o_mi_open_recent;
     IBOutlet id o_mi_open_recent_cm;
     IBOutlet id o_mi_open_wizard;
@@ -289,6 +303,8 @@ struct intf_sys_t
 
     NSSize o_size_with_playlist;
 
+    NSThread * manageThread;
+
     int     i_lastShownVolume;
 
     AppleRemote * o_remote;
@@ -300,7 +316,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;
@@ -339,6 +359,7 @@ struct intf_sys_t
 - (IBAction)intfOpenFileGeneric:(id)sender;
 - (IBAction)intfOpenDisc:(id)sender;
 - (IBAction)intfOpenNet:(id)sender;
+- (IBAction)intfOpenCapture:(id)sender;
 
 - (IBAction)showWizard:(id)sender;
 - (IBAction)showExtended:(id)sender;
@@ -358,6 +379,7 @@ struct intf_sys_t
 - (IBAction)openCrashLog:(id)sender;
 - (IBAction)viewErrorsAndWarnings:(id)sender;
 - (IBAction)showMessagesPanel:(id)sender;
+- (IBAction)showInformationPanel:(id)sender;
 
 - (IBAction)togglePlaylist:(id)sender;
 - (void)updateTogglePlaylistState;