X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=f9afd9faaa2ae92ee85db58267278f395dc25afb;hb=0eeb4286f4b713f9c443f493185535afe34866aa;hp=b93b60270792facabd488c67aae27e35c0107144;hpb=16b99ba1557e46efce54149ce9e860855626a7be;p=vlc diff --git a/include/main.h b/include/main.h index b93b602707..f9afd9faaa 100644 --- 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 @@ -19,50 +19,46 @@ * * 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. *****************************************************************************/ +#if !defined( __LIBVLC__ ) + #error You are not libvlc or one of its plugins. You cannot include this file +#endif + /***************************************************************************** - * 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 - /* 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 */ + vlc_bool_t b_ready; ///< Initialization boolean + uint32_t i_cpu; ///< CPU extensions - /* The message bank */ - msg_bank_t msg_bank; + /* Object structure data */ + int i_counter; ///< object counter + int i_objects; ///< Attached objects count + vlc_object_t ** pp_objects; ///< Array of all objects - /* The module bank */ - module_bank_t * p_module_bank; + module_bank_t * p_module_bank; ///< The 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; @@ -74,37 +70,40 @@ struct libvlc_t }; /***************************************************************************** - * 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 */ - - /* 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 - vlc_mutex_t quicktime_lock; /* QT is not thread safe on OSX */ + 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? + + 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 */ @@ -114,6 +113,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; };