X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=c798a60898197738a9de224299f48b9492b1f3b4;hb=12f8c376ddf570554a982e38f5f927f322962400;hp=1c6c9308214be69eacb3e0a9a138e30a326500b9;hpb=bf7985b74afcef9103b35a3c47eeae5845ae681b;p=vlc diff --git a/include/main.h b/include/main.h index 1c6c930821..c798a60898 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.49 2002/10/14 16:46:55 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,78 +19,66 @@ * * 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 + +TYPEDEF_ARRAY(input_item_t*, input_item_array_t); + /***************************************************************************** - * 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 */ + 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 - /* CPU extensions */ - u32 i_cpu; + char * psz_configfile; ///< location of config file - /* Generic settings */ - int i_verbose; /* info messages */ - vlc_bool_t b_color; /* color messages? */ + playlist_t *p_playlist; ///< playlist object - /* Object structure data */ - int i_counter; /* object counter */ - int i_objects; /* Attached objects count */ - vlc_object_t ** pp_objects; /* Array of all objects */ + vlc_object_t *p_interaction; ///< interface interaction object - /* The message bank */ - msg_bank_t msg_bank; + /* There is no real reason to keep a list of items, but not to break + * everything, let's keep it */ + input_item_array_t input_items; ///< Array of all created input items + int i_last_input_id ; ///< Last id of input item - /* The module bank */ - module_bank_t * p_module_bank; + /* Messages */ + msg_bank_t msg_bank; ///< The message bank + int i_verbose; ///< info messages + vlc_bool_t b_color; ///< color messages? - /* 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; -#endif -}; + 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_t, p_vlc - ***************************************************************************** - * This structure is a LibVLC instance. - *****************************************************************************/ -struct vlc_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 */ - - /* Generic settings */ - mtime_t i_desync; /* relative desync of the audio ouput */ + 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 - /* 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 */ + 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 - /* 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; + } *p_hotkeys; };