# endif
#include <vlc/vlc.h>
+#include <vlc/libvlc_structures.h>
+#include <vlc_arrays.h>
+#include <vlc_input.h>
+
/***************************************************************************
* Internal creation and destruction functions
***************************************************************************/
-libvlc_int_t *libvlc_InternalCreate( void );
-int libvlc_InternalInit( libvlc_int_t *, int, char *ppsz_argv[] );
-int libvlc_InternalCleanup( libvlc_int_t * );
-int libvlc_InternalDestroy( libvlc_int_t *, vlc_bool_t );
+VLC_EXPORT (libvlc_int_t *, libvlc_InternalCreate, ( void ) );
+VLC_EXPORT (int, libvlc_InternalInit, ( libvlc_int_t *, int, char *ppsz_argv[] ) );
+VLC_EXPORT (int, libvlc_InternalCleanup, ( libvlc_int_t * ) );
+VLC_EXPORT (int, libvlc_InternalDestroy, ( libvlc_int_t *, vlc_bool_t ) );
-int libvlc_InternalAddIntf( libvlc_int_t *, const char *, vlc_bool_t,
- vlc_bool_t, int, const char *const * );
+VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char *, vlc_bool_t,
+ vlc_bool_t, int, const char *const * ) );
+
+VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *, libvlc_exception_t * ) );
+VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t *, libvlc_exception_t * ) );
/***************************************************************************
* Opaque structures for libvlc API
struct libvlc_instance_t
{
libvlc_int_t *p_libvlc_int;
- vlm_t *p_vlm;
+ vlm_t *p_vlm;
+ int b_playlist_locked;
+ vlc_mutex_t instance_lock;
+ vlc_mutex_t event_callback_lock;
+ struct libvlc_callback_entry_list_t *p_callback_list;
+};
+
+struct libvlc_media_descriptor_t
+{
+ libvlc_event_manager_t * p_event_manager;
+ int b_preparsed;
+ input_item_t *p_input_item;
+ int i_refcount;
+ libvlc_instance_t *p_libvlc_instance;
+};
+
+struct libvlc_tag_query_t
+{
+ struct libvlc_instance_t *p_libvlc_instance; /* Parent instance */
+ int i_refcount;
+};
+
+
+struct libvlc_media_list_t
+{
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_instance_t * p_libvlc_instance;
+ int i_refcount;
+ vlc_mutex_t object_lock;
+ libvlc_media_list_t * p_media_provider; /* For dynamic sublist */
+ libvlc_tag_query_t * p_query; /* For dynamic sublist */
+ char * psz_name; /* Usually NULL */
+ DECL_ARRAY(void *) items;
+};
+
+struct libvlc_media_instance_t
+{
+ int i_refcount;
+ vlc_mutex_t object_lock;
+ int i_input_id; /* Input object id. We don't use a pointer to
+ avoid any crash */
+ struct libvlc_instance_t * p_libvlc_instance; /* Parent instance */
+ libvlc_media_descriptor_t * p_md; /* current media descriptor */
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_drawable_t drawable;
+};
+
+struct libvlc_media_list_player_t
+{
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_instance_t * p_libvlc_instance;
+ int i_refcount;
+ vlc_mutex_t object_lock;
+ int i_current_playing_index;
+ libvlc_media_descriptor_t * p_current_playing_item;
+ libvlc_media_list_t * p_mlist;
+ libvlc_media_instance_t * p_mi;
+};
+
+struct libvlc_media_library_t
+{
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_instance_t * p_libvlc_instance;
+ int i_refcount;
+ libvlc_media_list_t * p_mlist;
};
-struct libvlc_input_t
+struct libvlc_media_discoverer_t
{
- int i_input_id; ///< Input object id. We don't use a pointer to
- /// avoid any crash
- struct libvlc_instance_t *p_instance; ///< Parent instance
+ libvlc_event_manager_t * p_event_manager;
+ libvlc_instance_t * p_libvlc_instance;
+ services_discovery_t * p_sd;
+ libvlc_media_list_t * p_mlist;
};
+/*
+ * Event Handling
+ */
+/* Example usage
+ *
+ * struct libvlc_cool_object_t
+ * {
+ * ...
+ * libvlc_event_manager_t * p_event_manager;
+ * ...
+ * }
+ *
+ * libvlc_my_cool_object_new()
+ * {
+ * ...
+ * p_self->p_event_manager = libvlc_event_manager_init( p_self,
+ * p_self->p_libvlc_instance, p_e);
+ * libvlc_event_manager_register_event_type(p_self->p_event_manager,
+ * libvlc_MyCoolObjectDidSomething, p_e)
+ * ...
+ * }
+ *
+ * libvlc_my_cool_object_release()
+ * {
+ * ...
+ * libvlc_event_manager_release( p_self->p_event_manager );
+ * ...
+ * }
+ *
+ * libvlc_my_cool_object_do_something()
+ * {
+ * ...
+ * libvlc_event_t event;
+ * event.type = libvlc_MyCoolObjectDidSomething;
+ * event.u.my_cool_object_did_something.what_it_did = kSomething;
+ * libvlc_event_send( p_self->p_event_manager, &event );
+ * }
+ * */
+
+typedef struct libvlc_event_listener_t
+{
+ libvlc_event_type_t event_type;
+ void * p_user_data;
+ libvlc_callback_t pf_callback;
+} libvlc_event_listener_t;
+
+typedef struct libvlc_event_listeners_group_t
+{
+ libvlc_event_type_t event_type;
+ DECL_ARRAY(libvlc_event_listener_t *) listeners;
+} libvlc_event_listeners_group_t;
+
+typedef struct libvlc_event_manager_t
+{
+ void * p_obj;
+ struct libvlc_instance_t * p_libvlc_instance;
+ DECL_ARRAY(libvlc_event_listeners_group_t *) listeners_groups;
+} libvlc_event_sender_t;
+
+
+/***************************************************************************
+ * Other internal functions
+ ***************************************************************************/
+VLC_EXPORT (input_thread_t *, libvlc_get_input_thread,
+ ( struct libvlc_media_instance_t *, libvlc_exception_t * ) );
+
+/* Media instance */
+VLC_EXPORT (libvlc_media_instance_t *, libvlc_media_instance_new_from_input_thread,
+ ( struct libvlc_instance_t *, input_thread_t *, libvlc_exception_t * ) );
+
+VLC_EXPORT (void, libvlc_media_instance_destroy,
+ ( libvlc_media_instance_t * ) );
+
+/* Media Descriptor */
+VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_new_from_input_item,
+ ( struct libvlc_instance_t *, input_item_t *, libvlc_exception_t * ) );
+
+VLC_EXPORT (libvlc_media_descriptor_t *, libvlc_media_descriptor_duplicate,
+ ( libvlc_media_descriptor_t * ) );
+
+/* Events */
+VLC_EXPORT (void, libvlc_event_init, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );
+
+VLC_EXPORT (void, libvlc_event_fini, ( libvlc_instance_t *p_instance, libvlc_exception_t *p_e ) );
+
+VLC_EXPORT (libvlc_event_manager_t *, libvlc_event_manager_new, ( void * p_obj, libvlc_instance_t * p_libvlc_inst, libvlc_exception_t *p_e ) );
+
+VLC_EXPORT (void, libvlc_event_manager_release, ( libvlc_event_manager_t * p_em ) );
+
+VLC_EXPORT (void, libvlc_event_manager_register_event_type, ( libvlc_event_manager_t * p_em, libvlc_event_type_t event_type, libvlc_exception_t * p_e ) );
+
+VLC_EXPORT (void, libvlc_event_send, ( libvlc_event_manager_t * p_em, libvlc_event_t * p_event ) );
+
+
+/* Exception shorcuts */
+
#define RAISENULL( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \
return NULL; }
#define RAISEVOID( psz,a... ) { libvlc_exception_raise( p_e, psz,##a ); \