X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=46a22c93e28c40dd38bd3191016b4b058c4e6f16;hb=7ae23ab69222d3adf01245d23504891c50765a71;hp=1c6c9308214be69eacb3e0a9a138e30a326500b9;hpb=bf7985b74afcef9103b35a3c47eeae5845ae681b;p=vlc

diff --git a/include/main.h b/include/main.h
index 1c6c930821..46a22c93e2 100644
--- a/include/main.h
+++ b/include/main.h
@@ -2,8 +2,8 @@
  * main.h: access to all program variables
  * Declaration and extern access to global program object.
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
- * $Id: main.h,v 1.49 2002/10/14 16:46:55 sam Exp $
+ * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
+ * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
  *
@@ -11,7 +11,7 @@
  * 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
@@ -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 */
@@ -51,16 +51,33 @@ struct libvlc_t
     /* The message bank */
     msg_bank_t             msg_bank;
 
+    /* UTF-8 conversion */
+    vlc_mutex_t            from_locale_lock;
+    vlc_mutex_t            to_locale_lock;
+    vlc_iconv_t            from_locale;
+    vlc_iconv_t            to_locale;
+
     /* The module bank */
     module_bank_t *        p_module_bank;
 
     /* Arch-specific variables */
+#if !defined( WIN32 )
+    vlc_bool_t             b_daemon;
+#endif 
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
-#elif defined( WIN32 )
+    char *                 psz_vlcpath;
+#elif defined( SYS_DARWIN )
+    char *                 psz_vlcpath;
+    vlc_iconv_t            iconv_macosx; /* for HFS+ file names */
+    vlc_mutex_t            iconv_lock;
+#elif defined( WIN32 ) && !defined( UNDER_CE )
     SIGNALOBJECTANDWAIT    SignalObjectAndWait;
     vlc_bool_t             b_fast_mutex;
     int                    i_win9x_cv;
+    char *                 psz_vlcpath;
+#elif defined( UNDER_CE )
+    char *                 psz_vlcpath;
 #endif
 };
 
@@ -76,10 +93,9 @@ struct vlc_t
     /* Global properties */
     int                    i_argc;           /* command line arguments count */
     char **                ppsz_argv;              /* command line arguments */
-    char *                 psz_homedir;             /* user's home directory */
-
-    /* Generic settings */
-    mtime_t                i_desync;   /* relative desync of the audio ouput */
+    char *                 psz_homedir;           /* configuration directory */
+    char *                 psz_userdir;             /* user's home directory */
+    char *                 psz_configfile;        /* location of config file */
 
     /* Fast memcpy plugin used */
     module_t *             p_memcpy_module;
@@ -88,9 +104,24 @@ struct vlc_t
 
     /* Shared data - these structures are accessed directly from p_vlc by
      * several modules */
-    input_channel_t *      p_channel;                /* channel library data */
 
     /* 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
+
+    /* Structure storing the action name / key associations */
+    struct hotkey
+    {
+        const char *psz_action;
+        int i_action;
+        int i_key;
+        
+        /* hotkey accounting information */
+        mtime_t i_delta_date;/*< minimum delta time between two key presses */
+        mtime_t i_last_date; /*< last date key was pressed */
+        int     i_times;     /*< n times pressed within delta date*/
+    } *p_hotkeys;
 };