Dist vlc_fixups

[vlc] / src / control / event.c

diff --git a/src/control/event.c b/src/control/event.c
index 5dc3a0f3cd17c9f3b54f59f43270ce489c3e8142..016e3a0f7dfd66b3ac9155e55ee8a9818eea6c7f 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -31,7 +31,6 @@
  * Private functions
  */
 
-
 /*
  * Internal libvlc functions
  */
@@ -201,6 +200,54 @@ void libvlc_event_send( libvlc_event_manager_t * p_em,
  * Public libvlc functions
  */
 
+/**************************************************************************
+ *       libvlc_event_type_name (public) :
+ *
+ * Get the char * name of an event type.
+ **************************************************************************/
+static const char * event_type_to_name[] =
+{
+#define EVENT(a) [a]=#a
+    EVENT(libvlc_MediaDescriptorMetaChanged),
+    EVENT(libvlc_MediaDescriptorSubItemAdded),
+    EVENT(libvlc_MediaDescriptorDurationChanged),
+    EVENT(libvlc_MediaDescriptorPreparsedChanged),
+    EVENT(libvlc_MediaDescriptorFreed),
+    EVENT(libvlc_MediaDescriptorStateChanged),
+
+    EVENT(libvlc_MediaInstancePlayed),
+    EVENT(libvlc_MediaInstancePaused),
+    EVENT(libvlc_MediaInstanceReachedEnd),
+    EVENT(libvlc_MediaInstanceTimeChanged),
+    EVENT(libvlc_MediaInstancePositionChanged),
+
+    EVENT(libvlc_MediaListItemAdded),
+    EVENT(libvlc_MediaListWillAddItem),
+    EVENT(libvlc_MediaListItemDeleted),
+    EVENT(libvlc_MediaListWillDeleteItem),
+
+    EVENT(libvlc_MediaListViewItemAdded),
+    EVENT(libvlc_MediaListViewWillAddItem),
+    EVENT(libvlc_MediaListViewItemDeleted),
+    EVENT(libvlc_MediaListViewWillDeleteItem),
+
+    EVENT(libvlc_MediaListPlayerPlayed),
+    EVENT(libvlc_MediaListPlayerNextItemSet),
+    EVENT(libvlc_MediaListPlayerStopped),
+
+    EVENT(libvlc_MediaDiscovererStarted),
+    EVENT(libvlc_MediaDiscovererEnded)
+#undef EVENT
+};
+static const char * unkwown_event_name = "Unknown Event";
+
+const char * libvlc_event_type_name( libvlc_event_type_t event_type )
+{
+    if( event_type >= sizeof(event_type_to_name)/sizeof(event_type_to_name[0]))
+        return unkwown_event_name;
+    return event_type_to_name[event_type];
+}
+
 /**************************************************************************
  *       libvlc_event_attach (public) :
  *
@@ -239,7 +286,7 @@ void libvlc_event_attach( libvlc_event_manager_t * p_event_manager,
     free(listener);
     libvlc_exception_raise( p_e,
             "This object event manager doesn't know about '%s' events",
-            libvlc_event_type_name(a));
+            libvlc_event_type_name(event_type));
 }
 
 /**************************************************************************
@@ -301,6 +348,6 @@ void libvlc_event_detach_lock_state( libvlc_event_manager_t *p_event_manager,
         vlc_mutex_unlock( &p_event_manager->event_sending_lock );
 
     libvlc_exception_raise( p_e,
-            "This object event manager doesn't know about '%i,%p,%p' event observer",
-            event_type, pf_callback, p_user_data );
+            "This object event manager doesn't know about '%s,%p,%p' event observer",
+            libvlc_event_type_name(event_type), pf_callback, p_user_data );
 }