#ifndef LIBVLC_LIBVLC_H
# define LIBVLC_LIBVLC_H 1
+extern const char psz_vlc_changeset[];
+
typedef struct variable_t variable_t;
/* Actions (hot keys) */
-typedef struct action
-{
- char name[24];
- int value;
-} action_t;
-extern const struct action libvlc_actions[];
-extern const size_t libvlc_actions_count;
-extern int vlc_InitActions (libvlc_int_t *);
-extern void vlc_DeinitActions (libvlc_int_t *);
+struct vlc_actions;
+struct vlc_actions *vlc_InitActions (libvlc_int_t *);
+extern void vlc_DeinitActions (libvlc_int_t *, struct vlc_actions *);
+
+size_t vlc_towc (const char *str, uint32_t *restrict pwc);
/*
* OS-specific initialization
*/
-void system_Init ( libvlc_int_t *, int *, const char *[] );
-void system_Configure ( libvlc_int_t *, int *, const char *[] );
-void system_End ( libvlc_int_t * );
+void system_Init ( void );
+void system_Configure ( libvlc_int_t *, int, const char *const [] );
+void system_End ( void );
-/*
- * Legacy object stuff that is still used within libvlccore (only)
- */
-void vlc_object_detach (vlc_object_t *);
-#define vlc_object_detach( o ) vlc_object_detach(VLC_OBJECT(o))
+void vlc_CPU_init(void);
+void vlc_CPU_dump(vlc_object_t *);
/*
* Threads subsystem
*/
-/* This cannot be used as is from plugins: */
-void vlc_detach (vlc_thread_t);
+/* This cannot be used as is from plugins yet: */
+int vlc_clone_detach (vlc_thread_t *, void *(*)(void *), void *, int);
-/* 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);
+int vlc_set_priority( vlc_thread_t, int );
+
void vlc_threads_setup (libvlc_int_t *);
void vlc_trace (const char *fn, const char *file, unsigned line);
#endif
/*
- * CPU capabilities
+ * LibVLC exit event handling
*/
-extern uint32_t cpu_flags;
-uint32_t CPUCapabilities( void );
-bool vlc_CPU_CheckPluginDir (const char *name);
-
-/*
- * Message/logging stuff
- */
-
-typedef struct msg_bank_t msg_bank_t;
-
-msg_bank_t *msg_Create (void);
-void msg_Destroy (msg_bank_t *);
+typedef struct vlc_exit
+{
+ vlc_mutex_t lock;
+ void (*handler) (void *);
+ void *opaque;
+ bool killed;
+} vlc_exit_t;
-/** Internal message stack context */
-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 *);
+void vlc_ExitInit( vlc_exit_t * );
+void vlc_ExitDestroy( vlc_exit_t * );
/*
* LibVLC objects stuff
*
* @param p_this an existing VLC object
* @param i_size byte size of the object structure
- * @param i_type object type, usually VLC_OBJECT_CUSTOM
* @param psz_type object type name
* @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);
-#define vlc_custom_create(o, s, t, n) \
- vlc_custom_create(VLC_OBJECT(o), s, t, n)
+vlc_custom_create (vlc_object_t *p_this, size_t i_size, const char *psz_type);
+#define vlc_custom_create(o, s, n) \
+ vlc_custom_create(VLC_OBJECT(o), s, n)
/**
* Assign a name to an object for vlc_object_find_name().
extern int vlc_object_set_name(vlc_object_t *, const char *);
#define vlc_object_set_name(o, n) vlc_object_set_name(VLC_OBJECT(o), n)
+/* Types */
+typedef void (*vlc_destructor_t) (struct vlc_object_t *);
+void vlc_object_set_destructor (vlc_object_t *, vlc_destructor_t);
+#define vlc_object_set_destructor(a,b) \
+ vlc_object_set_destructor (VLC_OBJECT(a), b)
+
/*
* To be cleaned-up module stuff:
*/
struct vlc_object_internals
{
- int i_object_type; /* Object type, deprecated */
char *psz_name; /* given name */
/* Object variables */
vlc_mutex_t var_lock;
vlc_cond_t var_wait;
- /* Thread properties, if any */
- vlc_thread_t thread_id;
- bool b_thread;
-
/* Objects thread synchronization */
int pipes[2];
vlc_object_internals_t *next; /* next sibling */
vlc_object_internals_t *prev; /* previous sibling */
vlc_object_internals_t *first; /* first child */
- vlc_object_t *old_parent;
};
#define ZOOM_SECTION N_("Zoom")
{
libvlc_int_t public_data;
- int i_last_input_id ; ///< Last id of input item
bool playlist_active;
/* Messages */
- msg_bank_t *msg_bank; ///< The message bank
int i_verbose; ///< info messages
bool b_color; ///< color messages?
/* Singleton objects */
module_t *p_memcpy_module; ///< Fast memcpy plugin used
- playlist_t *p_playlist; //< the playlist singleton
+ playlist_t *p_playlist; ///< the playlist singleton
+ struct media_library_t *p_ml; ///< the ML singleton
+ vlc_mutex_t ml_lock; ///< Mutex for ML creation
vlm_t *p_vlm; ///< the VLM singleton (or NULL)
vlc_object_t *p_dialog_provider; ///< dialog provider
- httpd_t *p_httpd; ///< HTTP daemon (src/network/httpd.c)
#ifdef ENABLE_SOUT
sap_handler_t *p_sap; ///< SAP SDP advertiser
#endif
+ struct vlc_actions *actions; ///< Hotkeys handler
/* Interfaces */
struct intf_thread_t *p_intf; ///< Interfaces linked-list
/* Objects tree */
vlc_mutex_t structure_lock;
+
+ /* Exit callback */
+ vlc_exit_t exit;
} libvlc_priv_t;
static inline libvlc_priv_t *libvlc_priv (libvlc_int_t *libvlc)
*/
void var_OptionParse (vlc_object_t *, const char *, bool trusted);
-
/*
* Stats stuff
*/
void stats_CounterClean (counter_t * );
static inline int stats_GetInteger( vlc_object_t *p_obj, counter_t *p_counter,
- int *value )
+ int64_t *value )
{
int i_ret;
vlc_value_t val; val.i_int = 0;
}
#define stats_UpdateFloat(a,b,c,d) stats_UpdateFloat( VLC_OBJECT(a),b,c,d )
-VLC_EXPORT( void, stats_ComputeInputStats, (input_thread_t*, input_stats_t*) );
-VLC_EXPORT( void, stats_ReinitInputStats, (input_stats_t *) );
-VLC_EXPORT( void, stats_DumpInputStats, (input_stats_t *) );
-
-/*
- * 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 <dirent.h>
-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
+void stats_ComputeInputStats(input_thread_t*, input_stats_t*);
+void stats_ReinitInputStats(input_stats_t *);
+void stats_DumpInputStats(input_stats_t *);
#endif
projects / vlc / blobdiff