control/event.c: Properly implement libvlc_event_type_name, instead of relying on...

diff --git a/include/vlc/libvlc.h b/include/vlc/libvlc.h
index 4fa4e5d0f66f4a85c8bbc0119b1ece938da3134d..1f16b171e8e63d57f8eda177b6d168d6221a5d6e 100644 (file)
--- a/include/vlc/libvlc.h
+++ b/include/vlc/libvlc.h
@@ -1293,7 +1293,7 @@ VLC_PUBLIC_API void libvlc_event_detach( libvlc_event_manager_t *p_event_manager
  * Get an event type name
  * \param i_event_type the desired event
  */
-#define libvlc_event_type_name(a) #a
+VLC_PUBLIC_API const char * libvlc_event_type_name( libvlc_event_type_t event_type );
 
 /** @} */
 

diff --git a/src/control/event.c b/src/control/event.c
index 5dc3a0f3cd17c9f3b54f59f43270ce489c3e8142..c2c5232d0d5d6599395413589725928cd5d378b7 100644 (file)
--- a/src/control/event.c
+++ b/src/control/event.c
@@ -201,6 +201,49 @@ 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_MediaInstancePlayed),
+    EVENT(libvlc_MediaInstancePaused),
+    EVENT(libvlc_MediaInstanceReachedEnd),
+    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)
+#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 strdup(event_type_to_name[event_type]);
+}
+
 /**************************************************************************
  *       libvlc_event_attach (public) :
  *
@@ -239,7 +282,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));
 }
 
 /**************************************************************************