* Fixed the BeOS compile typo.

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 2f072a601b6b9e01311abb0b1ec24c5daceb40c7..dfc352b7a88660d3e93f256362832311ba22e26a 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -3,6 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: main.h,v 1.19 2001/05/30 17:03:11 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -32,7 +33,7 @@
  * should only be used by interface thread.
  *****************************************************************************/
 
-typedef struct
+typedef struct main_s
 {
     /* Global properties */
     int                    i_argc;           /* command line arguments count */
@@ -40,22 +41,22 @@ typedef struct
     char **                ppsz_env;                /* environment variables */
     char *                 psz_arg0;         /* program name (whithout path) */
 
+    int                    i_cpu_capabilities;             /* CPU extensions */
+    int                    i_warning_level;        /* warning messages level */
+
     /* Generic settings */
     boolean_t              b_audio;             /* is audio output allowed ? */
     boolean_t              b_video;             /* is video output allowed ? */
-    boolean_t              b_vlans;                 /* are vlans supported ? */
+    boolean_t              b_channels;    /* is channel changing supported ? */
 
     /* Unique threads */
-    p_aout_thread_t        p_aout;                    /* audio output thread */
     p_intf_thread_t        p_intf;                  /* main interface thread */
 
     /* Shared data - these structures are accessed directly from p_main by
      * several modules */
-    struct module_bank_s * p_module_bank;                     /* module bank */
-    p_plugin_bank_t        p_bank;                            /* plugin bank */
     p_playlist_t           p_playlist;                           /* playlist */
     p_intf_msg_t           p_msg;                 /* messages interface data */
-    p_input_vlan_t         p_vlan;                      /* vlan library data */
+    p_input_channel_t      p_channel;                /* channel library data */
 } main_t;
 
 extern main_t *p_main;