X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=include%2Fmain.h;h=3154e852ebf3191cb9355353a6574a52a89abf3a;hb=d1f89a0ca8d632af8e55e0b5b19941731fbb5981;hp=c31d5b2556bc473308123bd63f9d822d52304ecb;hpb=3a31acccc1b5720c3256c4677ac85282915fc610;p=vlc diff --git a/include/main.h b/include/main.h index c31d5b2556..3154e852eb 100644 --- a/include/main.h +++ b/include/main.h @@ -3,7 +3,7 @@ * Declaration and extern access to global program object. ***************************************************************************** * Copyright (C) 1999, 2000, 2001, 2002 VideoLAN - * $Id: main.h,v 1.39 2002/06/27 19:05:17 sam Exp $ + * $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 @@ -23,67 +23,95 @@ *****************************************************************************/ /***************************************************************************** - * vlc_t, p_vlc (global variable) + * libvlc_t (global variable) ***************************************************************************** - * 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 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. *****************************************************************************/ -struct vlc_s +struct libvlc_t { VLC_COMMON_MEMBERS - /* The vlc structure status */ - int i_status; + /* 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 */ + + /* The message bank */ + msg_bank_t msg_bank; + + /* The module bank */ + module_bank_t * p_module_bank; + + /* Arch-specific variables */ +#if !defined( WIN32 ) + vlc_bool_t b_daemon; +#endif +#if defined( SYS_BEOS ) + vlc_object_t * p_appthread; + char * psz_vlcpath; +#elif defined( SYS_DARWIN ) + char * psz_vlcpath; +#elif defined( WIN32 ) && !defined( UNDER_CE ) + SIGNALOBJECTANDWAIT SignalObjectAndWait; + vlc_bool_t b_fast_mutex; + int i_win9x_cv; + char * psz_vlcpath; +#endif +}; + +/***************************************************************************** + * 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 */ - - u32 i_cpu_capabilities; /* CPU extensions */ - - /* 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 */ + 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 ); /* FIXME: unimplemented */ - - /* The module bank */ - module_bank_t module_bank; - - /* The message bank */ - msg_bank_t msg_bank; + void* ( *pf_memset ) ( void *, int, size_t ); +#endif /* Shared data - these structures are accessed directly from p_vlc by * several modules */ - intf_msg_t * p_msg; /* messages interface data */ - input_channel_t * p_channel; /* channel library data */ /* Locks */ vlc_mutex_t config_lock; /* lock for the config file */ - vlc_mutex_t structure_lock; /* lock for the p_vlc tree */ - int i_unique; /* p_vlc occurence # */ - int i_counter; /* object counter */ +#ifdef SYS_DARWIN + vlc_mutex_t quicktime_lock; /* QT is not thread safe on OSX */ +#endif - /* Pointer to the big, evil global lock */ - vlc_mutex_t * p_global_lock; - void ** pp_global_data; + /* Structure storing the action name / key associations */ + struct hotkey + { + const char *psz_action; + int i_action; + int i_key; - /* System-specific variables */ -#if defined( SYS_BEOS ) - vlc_object_t * p_appthread; -#elif defined( WIN32 ) - SIGNALOBJECTANDWAIT SignalObjectAndWait; - vlc_bool_t b_fast_pthread; -#endif + } *p_hotkeys; };