#ifndef LIBVLC_LIBVLC_H
# define LIBVLC_LIBVLC_H 1
+typedef struct variable_t variable_t;
+
extern const char vlc_usage[];
/* Hotkey stuff */
int vlc_threads_init( void );
void vlc_threads_end( void );
+/* Hopefully, no need to export this. There is a new thread API instead. */
+void vlc_thread_cancel (vlc_object_t *);
+
+void vlc_trace (const char *fn, const char *file, unsigned line);
+#define vlc_backtrace() vlc_trace(__func__, __FILE__, __LINE__)
+
/*
* CPU capabilities
*/
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
* @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)
{
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
-
- module_bank_t * p_module_bank; ///< The module bank
-
char * psz_vlcpath;
} libvlc_global_data_t;
+/**
+ * The module bank
+ */
+extern module_bank_t *p_module_bank;
libvlc_global_data_t *vlc_global (void);
-libvlc_int_t *vlc_current_object (int i_object);
/**
* Private LibVLC data for each object.
*/
-struct vlc_object_internals_t
+typedef struct vlc_object_internals_t
{
/* Object variables */
variable_t * p_vars;
bool b_thread;
/* Objects thread synchronization */
+ vlc_mutex_t lock;
+ vlc_cond_t wait;
int pipes[2];
vlc_spinlock_t spin;
unsigned i_refcount;
vlc_destructor_t pf_destructor;
+ /* 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 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
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
} 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)
/**
#if defined (WIN32)
# include <dirent.h>
void *vlc_wopendir (const wchar_t *);
-void *vlc_wclosedir (void *);
+/* 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
-
-char *vlc_dgettext ( const char *package, const char *msgid );
#endif
#endif