* ALL: changed "struct foo_s" into "struct foo_t" to make greppers happy.

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index d01d6e008623b2d3cf1740d9f5510717c8a600d2..a6a108759e65ceff1182b08e8e1d17c7bfb5c652 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -2,8 +2,8 @@
  * main.h: access to all program variables
  * Declaration and extern access to global program object.
  *****************************************************************************
- * Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.14 2001/03/21 13:42:33 sam Exp $
+ * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
+ * $Id: main.h,v 1.40 2002/07/20 18:01:41 sam Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -23,7 +23,7 @@
  *****************************************************************************/
 
 /*****************************************************************************
- * main_t, p_main (global variable)
+ * vlc_t, p_vlc (global variable)
  *****************************************************************************
  * This structure has an unique instance, declared in main and pointed by the
  * only global variable of the program. It should allow access to any variable
@@ -32,45 +32,58 @@
  * it when you can access the members you need in an other way. In fact, it
  * should only be used by interface thread.
  *****************************************************************************/
-
-typedef struct
+struct vlc_t
 {
+    VLC_COMMON_MEMBERS
+
+    /* The vlc structure status */
+    int                    i_status;
+
     /* Global properties */
     int                    i_argc;           /* command line arguments count */
     char **                ppsz_argv;              /* command line arguments */
-    char **                ppsz_env;                /* environment variables */
-    char *                 psz_arg0;         /* program name (whithout path) */
+    char *                 psz_homedir;             /* user's home directory */
 
-    int                    i_cpu_capabilities;             /* CPU extensions */
-    int                    i_warning_level;        /* warning messages level */
+    u32                    i_cpu_capabilities;             /* CPU extensions */
 
     /* 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_dvd;                              /* DVD mode ? */
+    vlc_bool_t             b_quiet;                            /* be quiet ? */
+    vlc_bool_t             b_verbose;                     /* info messages ? */
+    vlc_bool_t             b_color;                      /* color messages ? */
+    mtime_t                i_desync;   /* relative desync of the audio ouput */
+
+    /* Fast memcpy plugin used */
+    module_t *             p_memcpy_module;
+    void* ( *pf_memcpy ) ( void *, const void *, size_t );
+    void* ( *pf_memset ) ( void *, int, size_t );    /* FIXME: unimplemented */
 
-    /* Unique threads */
-    p_vout_thread_t        p_vout;                    /* video output thread */
-    p_aout_thread_t        p_aout;                    /* audio output thread */
-    p_intf_thread_t        p_intf;                  /* main interface thread */
+    /* The module bank */
+    module_bank_t   module_bank;
 
-    /* Shared data - these structures are accessed directly from p_main by
+    /* The message bank */
+    msg_bank_t      msg_bank;
+
+    /* Shared data - these structures are accessed directly from p_vlc by
      * several modules */
-    struct module_bank_s * p_bank;                            /* module 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 */
-} main_t;
+    intf_msg_t *           p_msg;                 /* messages interface data */
+    input_channel_t *      p_channel;                /* channel library data */
 
-extern main_t *p_main;
+    /* Locks */
+    vlc_mutex_t            config_lock;          /* lock for the config file */
+    vlc_mutex_t            structure_lock;        /* lock for the p_vlc tree */
+    int                    i_unique;                    /* p_vlc occurence # */
+    int                    i_counter;                      /* object counter */
 
-/*****************************************************************************
- * Prototypes - these methods are used to get default values for some threads
- * and modules.
- *****************************************************************************/
-int    main_GetIntVariable( char *psz_name, int i_default );
-char * main_GetPszVariable( char *psz_name, char *psz_default );
-void   main_PutIntVariable( char *psz_name, int i_value );
-void   main_PutPszVariable( char *psz_name, char *psz_value );
+    /* Pointer to the big, evil global lock */
+    vlc_mutex_t *          p_global_lock;
+    void **                pp_global_data;
+
+    /* System-specific variables */
+#if defined( SYS_BEOS )
+    vlc_object_t *         p_appthread;
+#elif defined( WIN32 )
+    SIGNALOBJECTANDWAIT    SignalObjectAndWait;
+    vlc_bool_t             b_fast_pthread;
+#endif
+};