Move LibVLC error messages to libvlc_printerr().

[vlc] / src / control / libvlc_internal.h

diff --git a/src/control/libvlc_internal.h b/src/control/libvlc_internal.h
index 392bcce89bbcd407fad0f36a278c6e26782215df..7e784cd70909f882b71646a833db951c3e5543ae 100644 (file)
--- a/src/control/libvlc_internal.h
+++ b/src/control/libvlc_internal.h
@@ -47,96 +47,38 @@ VLC_EXPORT (void, libvlc_InternalDestroy, ( libvlc_int_t * ) );
 VLC_EXPORT (int, libvlc_InternalAddIntf, ( libvlc_int_t *, const char * ) );
 VLC_EXPORT (void, libvlc_InternalWait, ( libvlc_int_t * ) );
 
+typedef void (*libvlc_vlm_release_func_t)( libvlc_instance_t * ) ;
+
 /***************************************************************************
  * Opaque structures for libvlc API
  ***************************************************************************/
 
-typedef enum libvlc_lock_state_t
+typedef struct libvlc_vlm_t
 {
-    libvlc_Locked,
-    libvlc_UnLocked
-} libvlc_lock_state_t;
+    vlm_t                  *p_vlm;
+    libvlc_event_manager_t *p_event_manager;
+    libvlc_vlm_release_func_t pf_release;
+} libvlc_vlm_t;
 
 struct libvlc_instance_t
 {
     libvlc_int_t *p_libvlc_int;
-    vlm_t        *p_vlm;
-    int           b_playlist_locked;
+    libvlc_vlm_t  libvlc_vlm;
     unsigned      ref_count;
     int           verbosity;
     vlc_mutex_t   instance_lock;
-    vlc_mutex_t   event_callback_lock;
     struct libvlc_callback_entry_list_t *p_callback_list;
 };
 
 
-/*
- * 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_new( 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;
-    vlc_array_t listeners;
-    bool b_sublistener_removed;
-} libvlc_event_listeners_group_t;
-
-typedef struct libvlc_event_manager_t
-{
-    void * p_obj;
-    struct libvlc_instance_t * p_libvlc_instance;
-    vlc_array_t listeners_groups;
-    vlc_mutex_t object_lock;
-    vlc_mutex_t event_sending_lock;
-} libvlc_event_sender_t;
-
-
 /***************************************************************************
  * Other internal functions
  ***************************************************************************/
 
+/* Thread context */
+void libvlc_init_threads (void);
+void libvlc_deinit_threads (void);
+
 /* Events */
 libvlc_event_manager_t * libvlc_event_manager_new(
         void * p_obj, libvlc_instance_t * p_libvlc_inst,
@@ -154,14 +96,19 @@ void libvlc_event_send(
         libvlc_event_manager_t * p_em,
         libvlc_event_t * p_event );
 
+void libvlc_event_attach_async( libvlc_event_manager_t * p_event_manager,
+                               libvlc_event_type_t event_type,
+                               libvlc_callback_t pf_callback,
+                               void *p_user_data,
+                               libvlc_exception_t *p_e );
 
 /* Exception shorcuts */
 
-#define RAISENULL( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \
+#define RAISENULL( ... ) { libvlc_printerr(__VA_ARGS__); \
+                           libvlc_exception_raise( p_e ); \
                            return NULL; }
-#define RAISEVOID( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \
-                           return; }
-#define RAISEZERO( ... ) { libvlc_exception_raise( p_e, __VA_ARGS__ ); \
+#define RAISEZERO( ... ) { libvlc_printerr(__VA_ARGS__); \
+                           libvlc_exception_raise( p_e ); \
                            return 0; }
 
 #endif