subpicture_t now has a b_pausable attribute. When set to VLC_TRUE (default value...

[vlc] / include / main.h

diff --git a/include/main.h b/include/main.h
index b93b60270792facabd488c67aae27e35c0107144..55375520cb04e4d766db5e4eb55e5cc85e4d251d 100644 (file)
--- a/include/main.h
+++ b/include/main.h
@@ -2,7 +2,7 @@
  * main.h: access to all program variables
  * Declaration and extern access to global program object.
  *****************************************************************************
- * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN
+ * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team
  * $Id$
  *
  * Authors: Vincent Seguin <seguin@via.ecp.fr>
@@ -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.
  *****************************************************************************/
 
 /*****************************************************************************
@@ -33,36 +33,40 @@ struct libvlc_t
 {
     VLC_COMMON_MEMBERS
 
-    /* Initialization boolean */
-    vlc_bool_t             b_ready;
+    vlc_bool_t             b_ready;     ///< Initialization boolean
+    uint32_t               i_cpu;       ///< CPU extensions
+    
+    int                    i_verbose;   ///< info messages
+    vlc_bool_t             b_color;     ///< color messages?
 
-    /* CPU extensions */
-    uint32_t               i_cpu;
+    /* Object structure data */
+    int                    i_counter;   ///< object counter
+    int                    i_objects;   ///< Attached objects count
+    vlc_object_t **        pp_objects;  ///< Array of all objects 
 
-    /* Generic settings */
-    int                    i_verbose;                       /* info messages */
-    vlc_bool_t             b_color;                       /* color messages? */
+    msg_bank_t             msg_bank;    ///< The message bank
 
-    /* Object structure data */
-    int                    i_counter;                      /* object counter */
-    int                    i_objects;              /* Attached objects count */
-    vlc_object_t **        pp_objects;               /* Array of all objects */
+    module_bank_t *        p_module_bank; ///< The module bank
 
-    /* The message bank */
-    msg_bank_t             msg_bank;
+    vlc_bool_t             b_stats;         ///< Should we collect stats
+    /* Timers handling */
+    vlc_mutex_t            timer_lock;      ///< Lock to protect timers
+    int                    i_timers;        ///< Number of timers
+    counter_t            **pp_timers;       ///< Array of all timers
 
-    /* The module bank */
-    module_bank_t *        p_module_bank;
+    intf_thread_t         *p_probe;         ///< Devices prober
 
     /* 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,25 +89,21 @@ 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 */
     module_t *             p_memcpy_module;
-#if defined( UNDER_CE )
-    void* ( __cdecl *pf_memcpy ) ( void *, const void *, size_t );
-    void* ( __cdecl *pf_memset ) ( void *, int, size_t );
-#else
     void* ( *pf_memcpy ) ( void *, const void *, size_t );
     void* ( *pf_memset ) ( void *, int, size_t );
-#endif
 
     /* Shared data - these structures are accessed directly from p_vlc by
      * several modules */
 
     /* 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
 
@@ -114,6 +114,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;
 };