]> git.sesse.net Git - vlc/blobdiff - include/main.h
* moved the function definitions from threads.h into threads_funcs.h. This
[vlc] / include / main.h
index f8cc06379259d4a49390cb687b3dd7247f06b01f..1502b78478b088237b7b57dbbca4093f2f43eb4b 100644 (file)
@@ -3,7 +3,7 @@
  * Declaration and extern access to global program object.
  *****************************************************************************
  * Copyright (C) 1999, 2000 VideoLAN
- * $Id: main.h,v 1.30 2002/02/24 20:51:09 gbazin Exp $
+ * $Id: main.h,v 1.35 2002/04/27 22:11:22 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
 
 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 *                 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 */
@@ -47,7 +51,6 @@ typedef struct main_s
     /* Generic settings */
     boolean_t              b_audio;             /* is audio output allowed ? */
     boolean_t              b_video;             /* is video output allowed ? */
-    boolean_t              b_ac3;
     boolean_t              b_stereo;
     mtime_t                i_desync;   /* relative desync of the audio ouput */
 
@@ -64,9 +67,12 @@ 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)