libvlc_media_player: Allow reparenting in libvlc_media_player_set_drawable().

[vlc] / src / misc / events.c

diff --git a/src/misc/events.c b/src/misc/events.c
index e4e5434f9d63ee2124c11e26aa9134956ba5658a..60bc130c84afd4b29bf8e78c96a2162507d5bdc3 100644 (file)
--- a/src/misc/events.c
+++ b/src/misc/events.c
@@ -31,7 +31,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 
 #include <assert.h>
 
@@ -70,7 +70,7 @@ typedef struct vlc_event_listeners_group_t
 } vlc_event_listeners_group_t;
 
 #ifdef DEBUG_EVENT
-static const char * ppsz_event_type_to_name[] =
+static const char ppsz_event_type_to_name[][33] =
 {
     [vlc_InputItemMetaChanged]          = "vlc_InputItemMetaChanged",
     [vlc_InputItemSubItemAdded]         = "vlc_InputItemSubItemAdded",
@@ -115,7 +115,7 @@ int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
 {
     p_em->p_obj = p_obj;
     p_em->p_parent_object = p_parent_obj;
-    vlc_mutex_init( p_parent_obj, &p_em->object_lock );
+    vlc_mutex_init( &p_em->object_lock );
 
     /* We need a recursive lock here, because we need to be able
      * to call libvlc_event_detach even if vlc_event_send is in
@@ -123,7 +123,7 @@ int vlc_event_manager_init( vlc_event_manager_t * p_em, void * p_obj,
      * This ensures that after libvlc_event_detach, the callback
      * will never gets triggered.
      * */
-    vlc_mutex_init_recursive( p_parent_obj, &p_em->event_sending_lock );
+    vlc_mutex_init_recursive( &p_em->event_sending_lock );
     ARRAY_INIT( p_em->listeners_groups );
     return VLC_SUCCESS;
 }