[vlc-commits] activex: remove unused event names

[Ludovic Fauvet]

npapi-vlc | branch: master | Ludovic Fauvet <etix at videolan.org> | Wed Jan 16 17:52:06 2013 +0100| [a4018e57771640cc6ef69c7fdf491a05372865ed] | committer: Ludovic Fauvet

activex: remove unused event names

> http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=a4018e57771640cc6ef69c7fdf491a05372865ed
---

 activex/plugin.cpp |   34 +++++++++++++++++-----------------
 activex/plugin.h   |    1 -
 2 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index a175e2b..b96b648 100644
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -1273,23 +1273,23 @@ void VLCPlugin::on_player_action(vlc_player_action_e pa)
 }
 
 static vlcplugin_event_t vlcevents[] = {
-    //{ "MediaPlayerMediaChanged", libvlc_MediaPlayerMediaChanged, handle_input_state_event },
-    { "MediaPlayerNothingSpecial", libvlc_MediaPlayerNothingSpecial, handle_input_state_event },
-    { "MediaPlayerOpening", libvlc_MediaPlayerOpening, handle_input_state_event },
-    { "MediaPlayerBuffering", libvlc_MediaPlayerBuffering, handle_input_state_event },
-    { "MediaPlayerPlaying", libvlc_MediaPlayerPlaying, handle_input_state_event },
-    { "MediaPlayerPaused", libvlc_MediaPlayerPaused, handle_input_state_event },
-    { "MediaPlayerStopped", libvlc_MediaPlayerStopped, handle_input_state_event },
-    { "MediaPlayerForward", libvlc_MediaPlayerForward, handle_input_state_event },
-    { "MediaPlayerBackward", libvlc_MediaPlayerBackward, handle_input_state_event },
-    { "MediaPlayerEndReached", libvlc_MediaPlayerEndReached, handle_input_state_event },
-    { "MediaPlayerEncounteredError", libvlc_MediaPlayerEncounteredError, handle_input_state_event },
-    { "MediaPlayerTimeChanged", libvlc_MediaPlayerTimeChanged, handle_time_changed_event },
-    { "MediaPlayerPositionChanged", libvlc_MediaPlayerPositionChanged, handle_position_changed_event },
-    { "MediaPlayerSeekableChanged", libvlc_MediaPlayerSeekableChanged, handle_seekable_changed_event },
-    { "MediaPlayerPausableChanged", libvlc_MediaPlayerPausableChanged, handle_pausable_changed_event },
-    //{ "MediaPlayerTitleChanged", libvlc_MediaPlayerTitleChanged, handle_input_state_event },
-    //{ "MediaPlayerLengthChanged", libvlc_MediaPlayerLengthChanged, handle_input_state_event },
+    //{ libvlc_MediaPlayerMediaChanged, handle_input_state_event },         // unused
+    { libvlc_MediaPlayerNothingSpecial, handle_input_state_event },
+    { libvlc_MediaPlayerOpening, handle_input_state_event },
+    { libvlc_MediaPlayerBuffering, handle_input_state_event },
+    { libvlc_MediaPlayerPlaying, handle_input_state_event },
+    { libvlc_MediaPlayerPaused, handle_input_state_event },
+    { libvlc_MediaPlayerStopped, handle_input_state_event },
+    { libvlc_MediaPlayerForward, handle_input_state_event },
+    { libvlc_MediaPlayerBackward, handle_input_state_event },
+    { libvlc_MediaPlayerEndReached, handle_input_state_event },
+    { libvlc_MediaPlayerEncounteredError, handle_input_state_event },
+    { libvlc_MediaPlayerTimeChanged, handle_time_changed_event },
+    { libvlc_MediaPlayerPositionChanged, handle_position_changed_event },
+    { libvlc_MediaPlayerSeekableChanged, handle_seekable_changed_event },
+    { libvlc_MediaPlayerPausableChanged, handle_pausable_changed_event },
+    //{ libvlc_MediaPlayerTitleChanged, handle_input_state_event },         // unused
+    //{ libvlc_MediaPlayerLengthChanged, handle_input_state_event },        // unused
 };
 
 void VLCPlugin::player_register_events()
diff --git a/activex/plugin.h b/activex/plugin.h
index e7842a0..dbd7f2f 100644
--- a/activex/plugin.h
+++ b/activex/plugin.h
@@ -40,7 +40,6 @@ extern "C" const GUID DIID_DVLCEvents;
 #define ARRAY_SIZE(x) (sizeof(x) / sizeof((x)[0]))
 
 typedef struct {
-    const char *name;                      /* event name */
     const libvlc_event_type_t libvlc_type; /* libvlc event type */
     libvlc_callback_t libvlc_callback;     /* libvlc callback function */
 } vlcplugin_event_t;