*****************************************************************************/
/*****************************************************************************
- * libvlc_t (global variable)
+ * libvlc_global_data_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
+ * never accessed from the outside. It stores once-initialized data such as
* the CPU capabilities or the global lock.
*****************************************************************************/
-struct libvlc_t
+struct libvlc_global_data_t
{
VLC_COMMON_MEMBERS
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?
- /* Object structure data */
+ /* Object structure data */
int i_counter; ///< object counter
int i_objects; ///< Attached objects count
vlc_object_t ** pp_objects; ///< Array of all objects
- msg_bank_t msg_bank; ///< The message bank
-
module_bank_t * p_module_bank; ///< The module 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
-
- intf_thread_t *p_probe; ///< Devices prober
+ intf_thread_t *p_probe; ///< Devices prober
/* Arch-specific variables */
#if !defined( WIN32 )
};
/*****************************************************************************
- * 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; /* configuration directory */
- char * psz_userdir; /* user's home directory */
- char * psz_configfile; /* location of config file */
- char * psz_pidfile;
+ int i_argc; ///< command line arguments count
+ char ** ppsz_argv; ///< command line arguments
+ char * psz_homedir; ///< configuration directory
+ char * psz_userdir; ///< user's home directory
+ char * psz_configfile; ///< location of config file
+
+ playlist_t *p_playlist; ///< playlist object
+
+ /* Messages */
+ msg_bank_t msg_bank; ///< The message bank
+ int i_verbose; ///< info messages
+ vlc_bool_t b_color; ///< color messages?
- /* Fast memcpy plugin used */
- module_t * p_memcpy_module;
- void* ( *pf_memcpy ) ( void *, const void *, size_t );
- void* ( *pf_memset ) ( void *, int, size_t );
+ 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
- /* Shared data - these structures are accessed directly from p_vlc by
- * several modules */
+ 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
- /* Locks */
- vlc_mutex_t config_lock; /* lock for the config file */
+ vlc_mutex_t config_lock; ///< Lock for the config file
#ifdef __APPLE__
- vlc_mutex_t quicktime_lock; /* QT is not thread safe on OSX */
+ vlc_mutex_t quicktime_lock; ///< QT is not thread safe on OSX
#endif
/* Structure storing the action name / key associations */