* moved the function definitions from threads.h into threads_funcs.h. This

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 6e3398661f41b85293fd2b4222c3686c683ba648..1502b78478b088237b7b57dbbca4093f2f43eb4b 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.26 2001/12/10 04:53:10 sam Exp $
+ * $Id: main.h,v 1.35 2002/04/27 22:11:22 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -35,25 +35,29 @@
 
 typedef struct main_s
 {
+    /* Private data */
+    struct main_sys_s*     p_sys;          /* for system specific properties */
+
     /* 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 */
+    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_ac3;
-    int                    i_desync;   /* relative desync of the audio ouput */
+    boolean_t              b_stereo;
+    mtime_t                i_desync;   /* relative desync of the audio ouput */
 
     /* Fast memcpy plugin used */
-    struct module_s *      p_memcpy_module;
-    void *             ( * fast_memcpy ) ( void *, const void *, size_t );
+    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_intf_thread_t        p_intf;                  /* main interface thread */
@@ -63,20 +67,19 @@ typedef struct main_s
     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
+#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