#ifndef LIBVLC_LIBVLC_H
# define LIBVLC_LIBVLC_H 1
+typedef struct variable_t variable_t;
+
extern const char vlc_usage[];
/* Hotkey stuff */
/*
* Threads subsystem
*/
-int vlc_threads_init( void );
-void vlc_threads_end( void );
-vlc_object_t *vlc_threadobj (void);
-#ifdef LIBVLC_REFCHECK
-void vlc_refcheck (vlc_object_t *obj);
+extern vlc_mutex_t global_lock; /* TODO: remove this crap */
+
+/* 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_refcheck( obj ) (void)0
+# define vlc_assert_locked( m ) (void)m
#endif
/*
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 *);
/*
* @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);
-
-/**
- * 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.
- */
-typedef struct libvlc_global_data_t
-{
- VLC_COMMON_MEMBERS
-
- /* Object structure data */
- int i_counter; ///< object counter
+__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)
- module_bank_t * p_module_bank; ///< The module bank
- char * psz_vlcpath;
-} libvlc_global_data_t;
+extern char *psz_vlcpath;
-
-libvlc_global_data_t *vlc_global (void);
+#ifdef LIBVLC_USE_PTHREAD
+# include <semaphore.h> /* 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;
/* 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_spinlock_t ref_spin;
unsigned i_refcount;
vlc_destructor_t pf_destructor;
-#ifndef LIBVLC_REFCHECK
- vlc_thread_t creator_id;
-#endif
/* 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")
#define vlc_internals( obj ) (((vlc_object_internals_t*)(VLC_OBJECT(obj)))-1)
-/* Signal an object without checking for locking consistency. This is wrong. */
-#ifdef __GNUC__
-__attribute__((deprecated))
-#endif
-static inline void
-vlc_object_signal_maybe (vlc_object_t *p_this)
-{
- vlc_cond_signal (&(vlc_internals(p_this)->wait));
-}
+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
vlm_t *p_vlm; ///< the VLM singleton (or NULL)
interaction_t *p_interaction; ///< interface interaction object
httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c)
-
- /* Private playlist data (FIXME - playlist_t is too public...) */
- sout_instance_t *p_sout; ///< kept sout instance (for playlist)
-
- /* Thread support */
- unsigned threads_count;
- vlc_mutex_t threads_lock;
- vlc_cond_t threads_wait;
+#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 );
projects / vlc / blobdiff