X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=7527d9e6f98a3c44c2a6c91f99128d7a672f8017;hb=2067e26ab4694f2562742b19cd8e93493274ba46;hp=9434168d2b3b77b92ddcbf1a6cc6a32759933f4f;hpb=0369c9f0ac86ea0e0f385eab7b585a2566075517;p=vlc

diff --git a/include/main.h b/include/main.h
index 9434168d2b..7527d9e6f9 100644
--- a/include/main.h
+++ b/include/main.h
@@ -19,95 +19,49 @@
  *
  * 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.
  *****************************************************************************/
 
-/*****************************************************************************
- * libvlc_t (global variable)
- *****************************************************************************
- * This structure has an unique instance, statically allocated in main and
- * never accessed from the outside. It store once-initialized data such as
- * the CPU capabilities or the global lock.
- *****************************************************************************/
-struct libvlc_t
-{
-    VLC_COMMON_MEMBERS
-
-    /* Initialization boolean */
-    vlc_bool_t             b_ready;
-
-    /* CPU extensions */
-    uint32_t               i_cpu;
-
-    /* Generic settings */
-    int                    i_verbose;                       /* info messages */
-    vlc_bool_t             b_color;                       /* color messages? */
-
-    /* Object structure data */
-    int                    i_counter;                      /* object counter */
-    int                    i_objects;              /* Attached objects count */
-    vlc_object_t **        pp_objects;               /* Array of all objects */
-
-    /* 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;
-    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;
+#if !defined( __LIBVLC__ )
+  #error You are not libvlc or one of its plugins. You cannot include this file
 #endif
-};
 
 /*****************************************************************************
- * vlc_t, p_vlc
+ * libvlc_internal_instance_t
  *****************************************************************************
- * This structure is a LibVLC instance.
+ * This structure is a LibVLC instance, for use by libvlc core and plugins
  *****************************************************************************/
-struct vlc_t
+struct libvlc_int_t
 {
     VLC_COMMON_MEMBERS
 
     /* Global properties */
-    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 */
+    char *                 psz_homedir;      ///< user's home directory
+    char *                 psz_configdir;    ///< user's configuration directory
+    char *                 psz_datadir;      ///< user's data directory
+    char *                 psz_cachedir;     ///< user's cache directory
 
-    /* Fast memcpy plugin used */
-    module_t *             p_memcpy_module;
-    void* ( *pf_memcpy ) ( void *, const void *, size_t );
-    void* ( *pf_memset ) ( void *, int, size_t );
+    char *                 psz_configfile;   ///< location of config file
 
-    /* Shared data - these structures are accessed directly from p_vlc by
-     * several modules */
+    playlist_t            *p_playlist;       ///< playlist object
 
-    /* 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 */
+    /* Messages */
+    msg_bank_t             msg_bank;    ///< The message bank
+    int                    i_verbose;   ///< info messages
+    vlc_bool_t             b_color;     ///< color messages?
+
+    module_t *             p_memcpy_module;  ///< Fast memcpy plugin used
+    void* ( *pf_memcpy ) ( void *, const void *, size_t ); ///< fast memcpy
+    void* ( *pf_memset ) ( void *, int, size_t );          ///< fast memset
+
+    vlc_bool_t             b_stats;       ///< Should we collect stats ?
+    vlc_mutex_t            timer_lock;    ///< Lock to protect timers
+    int                    i_timers;      ///< Number of timers
+    counter_t            **pp_timers;     ///< Array of all timers
+
+    vlc_mutex_t            config_lock;    ///< Lock for the config file
+#ifdef __APPLE__
+    vlc_mutex_t            quicktime_lock; ///< QT is not thread safe on OSX
 #endif
 
     /* Structure storing the action name / key associations */
@@ -116,7 +70,7 @@ struct vlc_t
         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 */