X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=69e290db184f41933835c5e13a9daebdc65495e4;hb=37db19eb68bcd40dd525b65ae147e6cfcd4a58dc;hp=d5a248b8769a4e67b82c85e0c1f4499a1643fc6d;hpb=145b1961b4825d2a8d807bf02db90440a8c45380;p=vlc diff --git a/include/main.h b/include/main.h index d5a248b876..69e290db18 100644 --- a/include/main.h +++ b/include/main.h @@ -2,8 +2,8 @@ * main.h: access to all program variables * Declaration and extern access to global program object. ***************************************************************************** - * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN - * $Id: main.h,v 1.46 2002/10/03 13:21:54 sam Exp $ + * Copyright (C) 1999, 2000, 2001, 2002 the VideoLAN team + * $Id$ * * Authors: Vincent Seguin * @@ -11,7 +11,7 @@ * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the @@ -19,90 +19,65 @@ * * 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_internal_instance_t ***************************************************************************** - * 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. + * This structure is a LibVLC instance, for use by libvlc core and plugins *****************************************************************************/ -struct libvlc_t +struct libvlc_int_t { VLC_COMMON_MEMBERS - /* Initialization boolean */ - vlc_bool_t b_ready; + /* Global properties */ + int i_argc; ///< command line arguments count + char ** ppsz_argv; ///< command line arguments - /* CPU extensions */ - u32 i_cpu; + 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 - /* Object structure data */ - int i_counter; /* object counter */ - int i_objects; /* Attached objects count */ - vlc_object_t ** pp_objects; /* Array of all objects */ + char * psz_configfile; ///< location of config file - /* The big, evil global lock */ - vlc_mutex_t global_lock; - void * p_global_data; + playlist_t *p_playlist; ///< playlist object - /* Locks */ - vlc_mutex_t structure_lock; /* lock for the p_vlc tree */ + /* Messages */ + msg_bank_t msg_bank; ///< The message bank + int i_verbose; ///< info messages + vlc_bool_t b_color; ///< color messages? - /* The message bank */ - msg_bank_t msg_bank; + 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 - /* The module bank */ - module_bank_t * p_module_bank; + 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 - /* Arch-specific variables */ -#if defined( SYS_BEOS ) - vlc_object_t * p_appthread; -#elif defined( WIN32 ) - SIGNALOBJECTANDWAIT SignalObjectAndWait; - vlc_bool_t b_fast_mutex; - int i_win9x_cv; + 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 -}; - -/***************************************************************************** - * vlc_t, p_vlc - ***************************************************************************** - * This structure is a LibVLC instance. - *****************************************************************************/ -struct vlc_t -{ - VLC_COMMON_MEMBERS - - /* The vlc structure status */ - int i_status; - - /* Global properties */ - int i_argc; /* command line arguments count */ - char ** ppsz_argv; /* command line arguments */ - char * psz_homedir; /* user's home directory */ - - /* Generic settings */ - vlc_bool_t b_quiet; /* be quiet ? */ - vlc_bool_t b_verbose; /* info messages ? */ - vlc_bool_t b_color; /* color messages ? */ - mtime_t i_desync; /* relative desync of the audio ouput */ - - /* CPU extensions (inherited from libvlc_t) */ - u32 i_cpu; - - /* Fast memcpy plugin used */ - module_t * p_memcpy_module; - void* ( *pf_memcpy ) ( void *, const void *, size_t ); - void* ( *pf_memset ) ( void *, int, size_t ); - - /* Shared data - these structures are accessed directly from p_vlc by - * several modules */ - input_channel_t * p_channel; /* channel library data */ - /* Locks */ - vlc_mutex_t config_lock; /* lock for the config file */ + /* Structure storing the action name / key associations */ + struct hotkey + { + 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 */ + int i_times; /*< n times pressed within delta date*/ + } *p_hotkeys; };