* configure.ac:

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 7f93dc96b1bea472c8f1d2c9994a0cec99bc8775..64caf128f4136fd68e7d04cc884dc9abc9bed1fa 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, 2001, 2002 VideoLAN
- * $Id: main.h,v 1.50 2002/11/10 18:04:22 sam Exp $
+ * $Id: main.h,v 1.55 2003/09/24 21:31:54 gbazin Exp $
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -37,7 +37,7 @@ struct libvlc_t
     vlc_bool_t             b_ready;
 
     /* CPU extensions */
-    u32                    i_cpu;
+    uint32_t               i_cpu;
 
     /* Generic settings */
     int                    i_verbose;                       /* info messages */
@@ -57,10 +57,14 @@ struct libvlc_t
     /* Arch-specific variables */
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
+    char *                 psz_vlcpath;
+#elif defined( SYS_DARWIN )
+    char *                 psz_vlcpath;
 #elif defined( WIN32 ) && !defined( UNDER_CE )
     SIGNALOBJECTANDWAIT    SignalObjectAndWait;
     vlc_bool_t             b_fast_mutex;
     int                    i_win9x_cv;
+    char *                 psz_vlcpath;
 #endif
 };
 
@@ -77,13 +81,14 @@ struct vlc_t
     int                    i_argc;           /* command line arguments count */
     char **                ppsz_argv;              /* command line arguments */
     char *                 psz_homedir;             /* user's home directory */
+    char *                 psz_configfile;        /* location of config file */
 
     /* Generic settings */
     mtime_t                i_desync;   /* relative desync of the audio ouput */
 
     /* Fast memcpy plugin used */
     module_t *             p_memcpy_module;
-#if defined( WIN32 )
+#if defined( UNDER_CE )
     void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
     void* ( __cdecl *pf_memset ) ( void *, int, size_t );
 #else
@@ -97,5 +102,8 @@ struct vlc_t
 
     /* Locks */
     vlc_mutex_t            config_lock;          /* lock for the config file */
+#ifdef SYS_DARWIN
+    vlc_mutex_t            quicktime_lock;          /* QT is not thread safe on OSX */
+#endif
 };