Don't fail with no-debug

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index 401d0e937a155fb09abf42548b66dea00ea44b45..8b05e2b46a48807586726b1aec2ca23f4085d8fd 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -19,7 +19,7 @@
  *
  * 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.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -51,18 +51,30 @@ 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;
 
+    /* Do stats ? - We keep this boolean to avoid unneeded lookups */
+    vlc_bool_t             b_stats;
+    stats_handler_t       *p_stats;
+
     /* Arch-specific variables */
 #if !defined( WIN32 )
     vlc_bool_t             b_daemon;
-#endif 
+#endif
 #if defined( SYS_BEOS )
     vlc_object_t *         p_appthread;
     char *                 psz_vlcpath;
-#elif defined( SYS_DARWIN )
+#elif defined( __APPLE__ )
     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;
@@ -85,7 +97,8 @@ 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 */
+    char *                 psz_homedir;           /* configuration directory */
+    char *                 psz_userdir;             /* user's home directory */
     char *                 psz_configfile;        /* location of config file */
 
     /* Fast memcpy plugin used */
@@ -98,7 +111,7 @@ struct vlc_t
 
     /* Locks */
     vlc_mutex_t            config_lock;          /* lock for the config file */
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
     vlc_mutex_t            quicktime_lock;          /* QT is not thread safe on OSX */
 #endif
 
@@ -109,6 +122,10 @@ struct vlc_t
         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;
 };