X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=1502b78478b088237b7b57dbbca4093f2f43eb4b;hb=9d6920b9ea2758c13b94a02edb97dd3d3ec53e04;hp=b1ae2416379ea3cfb7de039893e7b566b1d3db27;hpb=2ad5fa640d389a2261699c0b657484b436aef23e;p=vlc

diff --git a/include/main.h b/include/main.h
index b1ae241637..1502b78478 100644
--- a/include/main.h
+++ b/include/main.h
@@ -1,8 +1,25 @@
 /*****************************************************************************
  * main.h: access to all program variables
- * (c)1999 VideoLAN
- *****************************************************************************
  * Declaration and extern access to global program object.
+ *****************************************************************************
+ * Copyright (C) 1999, 2000 VideoLAN
+ * $Id: main.h,v 1.35 2002/04/27 22:11:22 gbazin Exp $
+ *
+ * Authors: Vincent Seguin <seguin@via.ecp.fr>
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * 
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -15,35 +32,54 @@
  * 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
+
+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 */
+
+    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_vlans;                 /* are vlans 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_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 */
+    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 */
+
+    /* 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