X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=9194932afd29fd18bffe2225db37a7e3ec523a9c;hb=dd61f37b57429f10db99ffef010ec1c4e2fa0498;hp=9088550afbe9d9edac467efc2a700f4990f92ad8;hpb=cf825526dc105c5b0975ed9b5596cccb9d9bd493;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 9088550afb..9194932afd 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -40,32 +40,12 @@ void system_Init ( libvlc_int_t *, int *, const char *[] ); void system_Configure ( libvlc_int_t *, int *, const char *[] ); void system_End ( libvlc_int_t * ); -#if defined( SYS_BEOS ) -/* Nothing at the moment, create beos_specific.h when needed */ -#elif defined( __APPLE__ ) -/* Nothing at the moment, create darwin_specific.h when needed */ -#elif defined( WIN32 ) || defined( UNDER_CE ) -VLC_EXPORT( const char * , system_VLCPath, (void)); -#else -# define system_Init( a, b, c ) (void)0 -# define system_Configure( a, b, c ) (void)0 -# define system_End( a ) (void)0 -#endif - - /* * Threads subsystem */ int vlc_threads_init( void ); void vlc_threads_end( void ); -/** The global thread var for msg stack context - * We store this as a static global variable so we don't need a vlc_object_t - * everywhere. - * This key is created in vlc_threads_init and is therefore ready to use at - * the very beginning of the universe */ -extern vlc_threadvar_t msg_context_global_key; - /* * CPU capabilities */ @@ -76,12 +56,8 @@ uint32_t CPUCapabilities( void ); * Message/logging stuff */ -#define NB_QUEUES 2 - typedef struct msg_queue_t { - int i_id; - /** Message queue lock */ vlc_mutex_t lock; bool b_overflow; @@ -102,17 +78,41 @@ typedef struct msg_queue_t } msg_queue_t; /** - * Store all data requiered by messages interfaces. + * Store all data required by messages interfaces. */ typedef struct msg_bank_t { vlc_mutex_t lock; - msg_queue_t queues[NB_QUEUES]; + msg_queue_t queue; } msg_bank_t; +void msg_Create (libvlc_int_t *); +void msg_Flush (libvlc_int_t *); +void msg_Destroy (libvlc_int_t *); + +/** Internal message stack context */ +typedef struct +{ + int i_code; + char * psz_message; +} msg_context_t; + +void msg_StackSet ( int, const char*, ... ); +void msg_StackAdd ( const char*, ... ); +const char* msg_StackMsg ( void ); +/** The global thread var for msg stack context + * We store this as a static global variable so we don't need a vlc_object_t + * everywhere. + * This key is created in vlc_threads_init and is therefore ready to use at + * the very beginning of the universe */ +extern vlc_threadvar_t msg_context_global_key; +void msg_StackDestroy (void *); + /* * Unicode stuff */ +char *vlc_fix_readdir (const char *); +bool vlc_current_charset (char **); /* * LibVLC objects stuff @@ -147,21 +147,14 @@ typedef struct libvlc_global_data_t { VLC_COMMON_MEMBERS - /* Object structure data */ + /* Object structure data */ int i_counter; ///< object counter int i_objects; ///< Attached objects count vlc_object_t ** pp_objects; ///< Array of all objects module_bank_t * p_module_bank; ///< The module bank - /* Arch-specific variables */ -#if defined( SYS_BEOS ) - char * psz_vlcpath; -#elif defined( __APPLE__ ) char * psz_vlcpath; -#elif defined( WIN32 ) - char * psz_vlcpath; -#endif } libvlc_global_data_t; @@ -187,9 +180,12 @@ struct vlc_object_internals_t vlc_spinlock_t spin; /* Objects management */ + vlc_spinlock_t ref_spin; unsigned i_refcount; vlc_destructor_t pf_destructor; - bool b_attached; + + vlc_object_t **pp_children; + int i_children; }; #define ZOOM_SECTION N_("Zoom") @@ -212,6 +208,11 @@ typedef struct libvlc_priv_t vlc_mutex_t config_lock; ///< config file lock char * psz_configfile; ///< location of config file + /* 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 + /* Messages */ msg_bank_t msg_bank; ///< The message bank int i_verbose; ///< info messages @@ -223,8 +224,12 @@ typedef struct libvlc_priv_t int i_timers; ///< Number of timers bool b_stats; ///< Whether to collect stats + void *p_stats_computer; ///< Input thread computing stats + /// (needs cleanup) + module_t *p_memcpy_module; ///< Fast memcpy plugin used - vlm_t *p_vlm; ///< VLM if created from libvlc-common.c + playlist_t *p_playlist; //< the playlist singleton + vlm_t *p_vlm; ///< the VLM singleton (or NULL) vlc_object_t *p_interaction; ///< interface interaction object httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) } libvlc_priv_t; @@ -234,10 +239,7 @@ static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) return (libvlc_priv_t *)(libvlc + 1); } -static inline bool libvlc_stats (vlc_object_t *obj) -{ - return libvlc_priv (obj->p_libvlc)->b_stats; -} +#define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats) /** * LibVLC "main module" configuration settings array. @@ -250,4 +252,41 @@ extern const size_t libvlc_config_count; */ void var_OptionParse (vlc_object_t *, const char *, bool trusted); +/* + * Replacement functions + */ +# ifndef HAVE_DIRENT_H +typedef void DIR; +# ifndef FILENAME_MAX +# define FILENAME_MAX (260) +# endif +struct dirent +{ + long d_ino; /* Always zero. */ + unsigned short d_reclen; /* Always zero. */ + unsigned short d_namlen; /* Length of name in d_name. */ + char d_name[FILENAME_MAX]; /* File name. */ +}; +# define opendir vlc_opendir +# define readdir vlc_readdir +# define closedir vlc_closedir +# define rewinddir vlc_rewindir +void *vlc_opendir (const char *); +void *vlc_readdir (void *); +int vlc_closedir(void *); +void vlc_rewinddir(void *); +# endif + +#if defined (WIN32) +# include +void *vlc_wopendir (const wchar_t *); +/* void *vlc_wclosedir (void *); in vlc's exported symbols */ +struct _wdirent *vlc_wreaddir (void *); +void vlc_rewinddir (void *); +# define _wopendir vlc_wopendir +# define _wreaddir vlc_wreaddir +# define _wclosedir vlc_wclosedir +# define rewinddir vlc_rewinddir +#endif + #endif