X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Flibvlc.h;h=6cd9a0d93f9740e10fc24b84298fd41a2fba9935;hb=43b5fcef1b26f16914028b5954a846aff685c881;hp=6c0b92fc1dbf3b9d86978df86a803d3b5939df9b;hpb=80ddb522d75cca49a7337c62431709be670c9bdd;p=vlc diff --git a/src/libvlc.h b/src/libvlc.h index 6c0b92fc1d..6cd9a0d93f 100644 --- a/src/libvlc.h +++ b/src/libvlc.h @@ -25,6 +25,8 @@ #ifndef LIBVLC_LIBVLC_H # define LIBVLC_LIBVLC_H 1 +typedef struct variable_t variable_t; + extern const char vlc_usage[]; /* Hotkey stuff */ @@ -46,12 +48,19 @@ void system_End ( libvlc_int_t * ); 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; +/* Hopefully, no need to export this. There is a new thread API instead. */ +void vlc_thread_cancel (vlc_object_t *); +int vlc_object_waitpipe (vlc_object_t *obj); + +void vlc_trace (const char *fn, const char *file, unsigned line); +#define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__) + +#if defined (LIBVLC_USE_PTHREAD) && !defined (NDEBUG) +# define vlc_assert_locked( m ) \ + assert (pthread_mutex_lock (m) == EDEADLK) +#else +# define vlc_assert_locked( m ) (void)m +#endif /* * CPU capabilities @@ -63,12 +72,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; @@ -94,7 +99,7 @@ typedef struct msg_queue_t 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 *); @@ -102,19 +107,15 @@ 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 ); +void msg_StackDestroy (void *); /* * Unicode stuff */ +char *vlc_fix_readdir (const char *); /* * LibVLC objects stuff @@ -135,38 +136,27 @@ const char* msg_StackMsg ( void ); * @return the created object, or NULL. */ extern void * -vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, - const char *psz_type); +__vlc_custom_create (vlc_object_t *p_this, size_t i_size, int i_type, + const char *psz_type); +#define vlc_custom_create(o, s, t, n) \ + __vlc_custom_create(VLC_OBJECT(o), s, t, n) + /** - * libvlc_global_data_t (global variable) - * - * This structure has an unique instance, statically allocated in libvlc and - * never accessed from the outside. It stores process-wide VLC variables, - * mostly process-wide locks, and (currently) the module bank and objects tree. + * The module bank */ -typedef struct libvlc_global_data_t -{ - VLC_COMMON_MEMBERS - - /* Object structure data */ - int i_counter; ///< object counter - int i_objects; ///< Attached objects count - vlc_object_t ** pp_objects; ///< Array of all objects +extern module_bank_t *p_module_bank; - module_bank_t * p_module_bank; ///< The module bank +extern char *psz_vlcpath; - char * psz_vlcpath; -} libvlc_global_data_t; - - -libvlc_global_data_t *vlc_global (void); -libvlc_int_t *vlc_current_object (int i_object); +#ifdef LIBVLC_USE_PTHREAD +# include /* TODO: get rid of vlc_thread_ready and this */ +#endif /** * Private LibVLC data for each object. */ -struct vlc_object_internals_t +typedef struct vlc_object_internals_t { /* Object variables */ variable_t * p_vars; @@ -176,8 +166,15 @@ struct vlc_object_internals_t /* Thread properties, if any */ vlc_thread_t thread_id; bool b_thread; +#ifdef LIBVLC_USE_PTHREAD + sem_t thread_ready; +#elif defined (WIN32) + HANDLE thread_ready; +#endif /* Objects thread synchronization */ + vlc_mutex_t lock; + vlc_cond_t wait; int pipes[2]; vlc_spinlock_t spin; @@ -185,8 +182,12 @@ struct vlc_object_internals_t vlc_spinlock_t ref_spin; unsigned i_refcount; vlc_destructor_t pf_destructor; - bool b_attached; -}; + + /* Objects tree structure */ + vlc_object_t *prev, *next; + vlc_object_t **pp_children; + int i_children; +} vlc_object_internals_t; #define ZOOM_SECTION N_("Zoom") #define ZOOM_QUARTER_KEY_TEXT N_("1:4 Quarter") @@ -194,29 +195,29 @@ struct vlc_object_internals_t #define ZOOM_ORIGINAL_KEY_TEXT N_("1:1 Original") #define ZOOM_DOUBLE_KEY_TEXT N_("2:1 Double") -static inline vlc_object_internals_t *vlc_internals( vlc_object_t *obj ) -{ - return ((vlc_object_internals_t *)obj) - 1; -} +#define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1) + +typedef struct sap_handler_t sap_handler_t; /** * Private LibVLC instance data. */ typedef struct libvlc_priv_t { + libvlc_int_t public_data; + /* Configuration */ 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 bool b_color; ///< color messages? + vlc_dictionary_t msg_enabled_objects; ///< Enabled objects + bool msg_all_objects_enabled; ///< Should we print all objects? /* Timer stats */ vlc_mutex_t timer_lock; ///< Lock to protect timers @@ -227,18 +228,25 @@ typedef struct libvlc_priv_t void *p_stats_computer; ///< Input thread computing stats /// (needs cleanup) + /* Singleton objects */ module_t *p_memcpy_module; ///< Fast memcpy plugin used playlist_t *p_playlist; //< the playlist singleton vlm_t *p_vlm; ///< the VLM singleton (or NULL) - vlc_object_t *p_interaction; ///< interface interaction object + interaction_t *p_interaction; ///< interface interaction object httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c) +#ifdef ENABLE_SOUT + sap_handler_t *p_sap; ///< SAP SDP advertiser +#endif + vlc_mutex_t structure_lock; } libvlc_priv_t; static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc) { - return (libvlc_priv_t *)(libvlc + 1); + return (libvlc_priv_t *)libvlc; } +void playlist_ServicesDiscoveryKillAll( playlist_t *p_playlist ); + #define libvlc_stats( o ) (libvlc_priv((VLC_OBJECT(o))->p_libvlc)->b_stats) /** @@ -252,4 +260,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