* This the last piece of the new configuration module. You can now save your

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index bd868c2b985542a58f991cd61e3c87462d53e2c7..d3092ad5818d50c2a04817e066a2092d407f8e50 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -3,7 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.17 2001/05/01 04:18:17 sam Exp $
+ * $Id: main.h,v 1.32 2002/03/16 01:40:58 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -33,25 +33,29 @@
  * should only be used by interface thread.
  *****************************************************************************/
 
-typedef struct
+typedef struct main_s
 {
     /* 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) */
 
-    int                    i_cpu_capabilities;             /* CPU extensions */
+    u32                    i_cpu_capabilities;             /* CPU extensions */
     int                    i_warning_level;        /* warning messages level */
+    boolean_t              b_stats;                  /* display statistics ? */
 
     /* Generic settings */
     boolean_t              b_audio;             /* is audio output allowed ? */
     boolean_t              b_video;             /* is video output allowed ? */
-    boolean_t              b_channels;    /* is channel changing supported ? */
+    boolean_t              b_stereo;
+    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 */
 
     /* Shared data - these structures are accessed directly from p_main by
@@ -59,16 +63,19 @@ typedef struct
     p_playlist_t           p_playlist;                           /* playlist */
     p_intf_msg_t           p_msg;                 /* messages interface data */
     p_input_channel_t      p_channel;                /* channel library data */
+
+    /* Locks */
+    vlc_mutex_t            config_lock;          /* lock for the config file */
 } main_t;
 
+#ifndef PLUGIN
 extern main_t *p_main;
+#else
+#   define p_main (p_symbols->p_main)
+#endif
 
 /*****************************************************************************
- * Prototypes - these methods are used to get default values for some threads
- * and modules.
+ * Fast memory operation module
  *****************************************************************************/
-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 );
-
+#define FAST_MEMCPY p_main->pf_memcpy
+#define FAST_MEMSET p_main->pf_memset