macosx: Remove a warning that happen way too much.

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

diff --git a/modules/gui/macosx/intf.h b/modules/gui/macosx/intf.h
index c37ebb1e76510783af010afd52c3c84fd0ef7369..718a83bdab36dab8468b8d4ebe648b493d19efdf 100644 (file)
--- a/modules/gui/macosx/intf.h
+++ b/modules/gui/macosx/intf.h
@@ -28,7 +28,7 @@
 #   include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_interface.h>
 #include <vlc_playlist.h>
 #include <vlc_vout.h>
@@ -46,7 +46,6 @@
 /*****************************************************************************
  * Local prototypes.
  *****************************************************************************/
-int ExecuteOnMainThread( id target, SEL sel, void * p_arg );
 unsigned int CocoaKeyToVLC( unichar i_key );
 
 #define VLCIntf [[VLCMain sharedInstance] getIntf]
@@ -67,10 +66,6 @@ unsigned int CocoaKeyToVLC( unichar i_key );
 struct intf_sys_t
 {
     NSAutoreleasePool * o_pool;
-    NSPort * o_sendport;
-
-    /* the current input */
-    input_thread_t * p_input;
 
     /* special actions */
     bool b_mute;
@@ -92,13 +87,13 @@ struct intf_sys_t
 
     /* The messages window */
     msg_subscription_t * p_sub;
-
 };
 
 /*****************************************************************************
  * VLCMain interface
  *****************************************************************************/
 @class AppleRemote;
+@class VLCInformation;
 @interface VLCMain : NSObject
 {
     intf_thread_t *p_intf;      /* The main intf object */
@@ -111,8 +106,7 @@ struct intf_sys_t
     id o_bookmarks;             /* VLCBookmarks   */
     id o_embedded_list;         /* VLCEmbeddedList*/
     id o_interaction_list;      /* VLCInteractionList*/
-    id o_sfilters;              /* VLCsFilters    */
-    id o_info;                  /* VLCInformation */
+    VLCInformation * o_info;                  /* VLCInformation */
 #ifdef UPDATE_CHECK
     id o_update;                /* VLCUpdate      */
 #endif
@@ -123,7 +117,6 @@ struct intf_sys_t
     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 */
     BOOL nib_info_loaded;       /* information panel nibfile */
@@ -182,6 +175,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;
@@ -304,6 +298,12 @@ struct intf_sys_t
 
     int     i_lastShownVolume;
 
+    /* the manage thread */
+    pthread_t manage_thread;
+
+    /* The timer that update the interface */
+    NSTimer * interfaceTimer;
+
     AppleRemote * o_remote;
     BOOL b_remote_button_hold; /* true as long as the user holds the left,right,plus or minus on the remote control */
 }
@@ -356,11 +356,11 @@ 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;
 - (IBAction)showBookmarks:(id)sender;
-- (IBAction)showSFilters:(id)sender;
 
 - (IBAction)viewAbout:(id)sender;
 - (IBAction)showLicense:(id)sender;