X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=7527d9e6f98a3c44c2a6c91f99128d7a672f8017;hb=12c70d4b6eb8c2e682bf6c045ec8f217c033b511;hp=1502b78478b088237b7b57dbbca4093f2f43eb4b;hpb=9d6920b9ea2758c13b94a02edb97dd3d3ec53e04;p=vlc diff --git a/include/main.h b/include/main.h index 1502b78478..7527d9e6f9 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 VideoLAN - * $Id: main.h,v 1.35 2002/04/27 22:11:22 gbazin 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,67 +19,62 @@ * * 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 + /***************************************************************************** - * main_t, p_main (global variable) + * libvlc_internal_instance_t ***************************************************************************** - * This structure has an unique instance, declared in main and pointed by the - * only global variable of the program. It should allow access to any variable - * of the program, for user-interface purposes or more easier call of interface - * and common functions (example: the intf_*Msg functions). Please avoid using - * it when you can access the members you need in an other way. In fact, it - * should only be used by interface thread. + * This structure is a LibVLC instance, for use by libvlc core and plugins *****************************************************************************/ - -typedef struct main_s +struct libvlc_int_t { - /* Private data */ - struct main_sys_s* p_sys; /* for system specific properties */ + VLC_COMMON_MEMBERS /* Global properties */ - int i_argc; /* command line arguments count */ - char ** ppsz_argv; /* command line arguments */ - char * psz_arg0; /* program name (whithout path) */ - char * psz_homedir; /* user's home directory */ - - u32 i_cpu_capabilities; /* CPU extensions */ - int i_warning_level; /* warning messages level */ - boolean_t b_stats; /* display statistics ? */ + 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 - /* Generic settings */ - boolean_t b_audio; /* is audio output allowed ? */ - boolean_t b_video; /* is video output allowed ? */ - boolean_t b_stereo; - mtime_t i_desync; /* relative desync of the audio ouput */ + char * psz_configfile; ///< location of config file - /* Fast memcpy plugin used */ - module_t * p_memcpy_module; - void* ( *pf_memcpy ) ( void *, const void *, size_t ); - void* ( *pf_memset ) ( void *, int, size_t ); /* FIXME: unimplemented */ + playlist_t *p_playlist; ///< playlist object - /* Unique threads */ - p_intf_thread_t p_intf; /* main interface thread */ + /* Messages */ + msg_bank_t msg_bank; ///< The message bank + int i_verbose; ///< info messages + vlc_bool_t b_color; ///< color messages? - /* Shared data - these structures are accessed directly from p_main by - * several modules */ - p_playlist_t p_playlist; /* playlist */ - p_intf_msg_t p_msg; /* messages interface data */ - p_input_channel_t p_channel; /* channel library data */ + 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 - /* Locks */ - vlc_mutex_t config_lock; /* lock for the config file */ -} main_t; + 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 -#ifndef __PLUGIN__ -extern main_t *p_main; -#else -# define p_main (p_symbols->p_main) + 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 -/***************************************************************************** - * Fast memory operation module - *****************************************************************************/ -#define FAST_MEMCPY p_main->pf_memcpy -#define FAST_MEMSET p_main->pf_memset + /* 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; +}; +