activex: implement JS Events

diff --git a/projects/activex/axvlc.idl b/projects/activex/axvlc.idl
index a1846f0ca485df1415fb8844ce8748b3851a633c..78defb74f9b09b6ff831cd20dfa25a7b8f0ff6b6 100644 (file)
--- a/projects/activex/axvlc.idl
+++ b/projects/activex/axvlc.idl
@@ -168,6 +168,28 @@ library AXVLC
     const int DISPID_PauseEvent = 101;\r
     const int DISPID_StopEvent  = 102;\r
 \r
+    /* async events from libvlc */\r
+    const int DISPID_NothingSpecialEvent = 200;\r
+    const int DISPID_OpeningEvent = 201;\r
+    const int DISPID_BufferingEvent = 202;\r
+    const int DISPID_PlayingEvent = 203;\r
+    const int DISPID_PausedEvent = 204;\r
+    const int DISPID_ForwardEvent = 205;\r
+    const int DISPID_BackwardEvent = 206;\r
+    const int DISPID_EncounteredErrorEvent = 207;\r
+    const int DISPID_EndReachedEvent = 208;\r
+    const int DISPID_StoppedEvent = 209;\r
+\r
+    const int DISPID_TimeChangedEvent = 210;\r
+    const int DISPID_PositionChangedEvent = 211;\r
+    const int DISPID_SeekableChangedEvent = 212;\r
+    const int DISPID_PausableChangedEvent = 213;\r
+\r
+    const int DISPID_MouseButtonEvent = 214;\r
+    const int DISPID_MouseMovedEvent = 215;\r
+    const int DISPID_MouseClickedEvent = 216;\r
+    const int DISPID_MouseObjectEvent = 217;\r
+\r
     [\r
       uuid(DF48072F-5EF8-434e-9B40-E2F3AE759B5F),\r
       helpstring("Event interface for VLC control"),\r
@@ -182,6 +204,48 @@ library AXVLC
             void pause();\r
             [id(DISPID_StopEvent), helpstring("Stopped")]\r
             void stop();\r
+\r
+            /* asyn events from libvlc */\r
+            [id(DISPID_NothingSpecialEvent), helpstring("Idle state")]\r
+            void idle();\r
+            [id(DISPID_OpeningEvent), helpstring("Opening media")]\r
+            void opening();\r
+            [id(DISPID_BufferingEvent), helpstring("Buffering media")]\r
+            void buffering();\r
+            [id(DISPID_PlayingEvent), helpstring("Media is playing")]\r
+            void playing();\r
+            [id(DISPID_PausedEvent), helpstring("Media is paused")]\r
+            void paused();\r
+            [id(DISPID_ForwardEvent), helpstring("Forward playback")]\r
+            void forward();\r
+            [id(DISPID_BackwardEvent), helpstring("Backward playback")]\r
+            void backward();\r
+            [id(DISPID_EncounteredErrorEvent), helpstring("An error has been encountered")]\r
+            void error();\r
+            [id(DISPID_EndReachedEvent), helpstring("End of playback reached")]\r
+            void ended();\r
+            [id(DISPID_StoppedEvent), helpstring("Playback stopped")]\r
+            void stopped();\r
+\r
+            [id(DISPID_TimeChangedEvent), helpstring("Time changed")]\r
+            void TimeChanged([in] long time);\r
+            [id(DISPID_PositionChangedEvent), helpstring("Position changed")]\r
+            void PositionChanged([in] long position);\r
+            [id(DISPID_SeekableChangedEvent), helpstring("Seek changed")]\r
+            void SeekableChanged([in] VARIANT_BOOL seekable);\r
+            [id(DISPID_PausableChangedEvent), helpstring("Pause setting changed")]\r
+            void PausableChanged([in] VARIANT_BOOL pausable);\r
+\r
+            [id(DISPID_MouseButtonEvent), helpstring("Mouse button pressed")]\r
+            void MouseButton([in] VARIANT_BOOL btn_right, [in] VARIANT_BOOL btn_center,\r
+                [in] VARIANT_BOOL btn_left, [in] VARIANT_BOOL btn_wheel_up,\r
+                [in] VARIANT_BOOL bnt_wheel_down);\r
+            [id(DISPID_MouseMovedEvent), helpstring("Mouse moved")]\r
+            void MouseMoved([in] long x, [in] long y);\r
+            [id(DISPID_MouseClickedEvent), helpstring("Mouse clicked")]\r
+            void MouseClicked([in] VARIANT_BOOL clicked);\r
+            [id(DISPID_MouseObjectEvent), helpstring("Mouse selected holds object")]\r
+            void MouseObject([in] VARIANT_BOOL moved);\r
     };\r
 \r
     [\r
@@ -619,5 +683,6 @@ library AXVLC
     {\r
         [default] interface IVLCControl2;\r
         interface IVLCControl;\r
+        [default, source] dispinterface DVLCEvents;\r
     };\r
 };\r

diff --git a/projects/activex/axvlc.tlb b/projects/activex/axvlc.tlb
index 5ddd2e11a13df28993252d91185dad036c75c64b..4bc10a0cb9ed2e3f42776fb9bbddeaf4d6ea0950 100644 (file)
Binary files a/projects/activex/axvlc.tlb and b/projects/activex/axvlc.tlb differ

diff --git a/projects/activex/axvlc_idl.c b/projects/activex/axvlc_idl.c
index 7b1a9ba901805e6915f840cd9eda24f49794576b..60804b397d55973ee3f7d60a5429d7bf3d3387d6 100644 (file)
--- a/projects/activex/axvlc_idl.c
+++ b/projects/activex/axvlc_idl.c
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.1.23 from axvlc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.1.36 from axvlc.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>

diff --git a/projects/activex/axvlc_idl.h b/projects/activex/axvlc_idl.h
index 705ef9b762e99d6837f4243aced8a95a7c3e1692..0eb2b09a22ee7efda5a6c26ecb55bea9463e12f8 100644 (file)
--- a/projects/activex/axvlc_idl.h
+++ b/projects/activex/axvlc_idl.h
@@ -1,4 +1,4 @@
-/*** Autogenerated by WIDL 1.1.23 from axvlc.idl - Do not edit ***/
+/*** Autogenerated by WIDL 1.1.36 from axvlc.idl - Do not edit ***/
 
 #include <rpc.h>
 #include <rpcndr.h>
@@ -793,6 +793,42 @@ void __RPC_STUB IVLCControl_put_AutoLoop_Stub(
 
 #define DISPID_StopEvent (102)
 
+#define DISPID_NothingSpecialEvent (200)
+
+#define DISPID_OpeningEvent (201)
+
+#define DISPID_BufferingEvent (202)
+
+#define DISPID_PlayingEvent (203)
+
+#define DISPID_PausedEvent (204)
+
+#define DISPID_ForwardEvent (205)
+
+#define DISPID_BackwardEvent (206)
+
+#define DISPID_EncounteredErrorEvent (207)
+
+#define DISPID_EndReachedEvent (208)
+
+#define DISPID_StoppedEvent (209)
+
+#define DISPID_TimeChangedEvent (210)
+
+#define DISPID_PositionChangedEvent (211)
+
+#define DISPID_SeekableChangedEvent (212)
+
+#define DISPID_PausableChangedEvent (213)
+
+#define DISPID_MouseButtonEvent (214)
+
+#define DISPID_MouseMovedEvent (215)
+
+#define DISPID_MouseClickedEvent (216)
+
+#define DISPID_MouseObjectEvent (217)
+
 /*****************************************************************************
  * DVLCEvents dispinterface
  */

diff --git a/projects/activex/plugin.cpp b/projects/activex/plugin.cpp
index f14ad5aac3de770a6b12785eeb74bfef9347a6a3..1b3efdd43aa14babe1a0759c8eef5f6f6dd651dd 100644 (file)
--- a/projects/activex/plugin.cpp
+++ b/projects/activex/plugin.cpp
@@ -272,7 +272,12 @@ VLCPlugin::~VLCPlugin()
     SysFreeString(_bstr_mrl);
     SysFreeString(_bstr_baseurl);
 
-    if( _p_mplayer ) { libvlc_media_player_release(_p_mplayer); _p_mplayer=NULL; }
+    if( _p_mplayer )
+    {
+        player_unregister_events();
+        libvlc_media_player_release(_p_mplayer);
+        _p_mplayer=NULL;
+    }
     if( _p_mlist )   { libvlc_media_list_release(_p_mlist); _p_mlist=NULL; }
     if( _p_libvlc )  { libvlc_release(_p_libvlc); _p_libvlc=NULL; }
 
@@ -996,6 +1001,252 @@ void VLCPlugin::fireOnStopEvent(void)
     vlcConnectionPointContainer->fireEvent(DISPID_StopEvent, &dispparamsNoArgs);
 };
 
+/*
+ * Async events
+ */
+void VLCPlugin::fireOnIdleEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_NothingSpecialEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnOpeningEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_OpeningEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnBufferingEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_BufferingEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnPlayingEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_PlayingEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnPausedEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_PausedEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnErrorEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_EncounteredErrorEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnEndedEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_EndReachedEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnStoppedEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_StoppedEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnForwardEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_ForwardEvent, &dispparamsNoArgs);
+};
+
+void VLCPlugin::fireOnBackwardEvent()
+{
+    DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0};
+    vlcConnectionPointContainer->fireEvent(DISPID_BackwardEvent, &dispparamsNoArgs);
+};
+
+static void handle_input_state_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    switch( event->type )
+    {
+        case libvlc_MediaPlayerNothingSpecial:
+            plugin->fireOnIdleEvent();
+            break;
+        case libvlc_MediaPlayerOpening:
+            plugin->fireOnOpeningEvent();
+            break;
+        case libvlc_MediaPlayerBuffering:
+            plugin->fireOnBufferingEvent();
+            break;
+        case libvlc_MediaPlayerPlaying:
+            plugin->fireOnPlayingEvent();
+            break;
+        case libvlc_MediaPlayerPaused:
+            plugin->fireOnPausedEvent();
+            break;
+        case libvlc_MediaPlayerStopped:
+            plugin->fireOnStoppedEvent();
+            break;
+        case libvlc_MediaPlayerForward:
+            plugin->fireOnForwardEvent();
+            break;
+        case libvlc_MediaPlayerBackward:
+            plugin->fireOnBackwardEvent();
+            break;
+        case libvlc_MediaPlayerEndReached:
+            plugin->fireOnEndedEvent();
+            break;
+        case libvlc_MediaPlayerEncounteredError:
+            plugin->fireOnErrorEvent();
+            break;
+    }
+}
+
+void VLCPlugin::fireOnTimeChangedEvent(long time)
+{
+    VARIANT varPos;
+    DISPPARAMS params = { &varPos, NULL, 1, 0 };
+    varPos.vt = VT_I4;
+    varPos.lVal = time;
+    vlcConnectionPointContainer->fireEvent(DISPID_TimeChangedEvent, &params);
+};
+
+static void handle_time_changed_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnTimeChangedEvent(event->u.media_player_time_changed.new_time);
+}
+
+void VLCPlugin::fireOnPositionChangedEvent(long position)
+{
+    VARIANT varPos;
+    DISPPARAMS params = { &varPos, NULL, 1, 0 };
+    varPos.vt = VT_I4;
+    varPos.lVal = position;
+    vlcConnectionPointContainer->fireEvent(DISPID_PositionChangedEvent, &params);
+};
+
+static void handle_position_changed_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnPositionChangedEvent(event->u.media_player_position_changed.new_position);
+}
+
+void VLCPlugin::fireOnSeekableChangedEvent(VARIANT_BOOL seekable)
+{
+    VARIANT varSeek;
+    DISPPARAMS params = { &varSeek, NULL, 1, 0 };
+    varSeek.vt = VT_BOOL;
+    varSeek.boolVal = seekable;
+    vlcConnectionPointContainer->fireEvent(DISPID_SeekableChangedEvent, &params);
+};
+
+static void handle_seekable_changed_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnSeekableChangedEvent(event->u.media_player_seekable_changed.new_seekable);
+}
+
+void VLCPlugin::fireOnPausableChangedEvent(VARIANT_BOOL pausable)
+{
+    VARIANT varPause;
+    DISPPARAMS params = { &varPause, NULL, 1, 0 };
+    varPause.vt = VT_BOOL;
+    varPause.boolVal = pausable;
+    vlcConnectionPointContainer->fireEvent(DISPID_PausableChangedEvent, &params);
+};
+
+static void handle_pausable_changed_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnPausableChangedEvent(event->u.media_player_pausable_changed.new_pausable);
+}
+
+/* mouse events */
+void VLCPlugin::fireOnMouseButtonEvent(VARIANT_BOOL btn_right, VARIANT_BOOL btn_center,
+                VARIANT_BOOL btn_left, VARIANT_BOOL btn_wheel_up,
+                VARIANT_BOOL btn_wheel_down)
+{
+    VARIANT varButton[5];
+    DISPPARAMS params = { varButton, NULL, 5, 0 };
+    varButton[0].vt = VT_BOOL;
+    varButton[0].boolVal = btn_right;
+    varButton[1].vt = VT_BOOL;
+    varButton[1].boolVal = btn_center;
+    varButton[2].vt = VT_BOOL;
+    varButton[2].boolVal = btn_left;
+    varButton[3].vt = VT_BOOL;
+    varButton[3].boolVal = btn_wheel_up;
+    varButton[4].vt = VT_BOOL;
+    varButton[4].boolVal = btn_wheel_down;
+    vlcConnectionPointContainer->fireEvent(DISPID_MouseButtonEvent, &params);
+};
+
+void VLCPlugin::fireOnMouseMovedEvent(long x, long y)
+{
+    VARIANT varMoved[2];
+    DISPPARAMS params = { varMoved, NULL, 3, 0 };
+    varMoved[0].vt = VT_INT;
+    varMoved[0].intVal = x;
+    varMoved[1].vt = VT_INT;
+    varMoved[1].intVal = y;
+    vlcConnectionPointContainer->fireEvent(DISPID_MouseMovedEvent, &params);
+};
+
+void VLCPlugin::fireOnMouseClickedEvent(VARIANT_BOOL clicked)
+{
+    VARIANT varClicked;
+    DISPPARAMS params = { &varClicked, NULL, 1, 0 };
+    varClicked.vt = VT_BOOL;
+    varClicked.boolVal = clicked;
+    vlcConnectionPointContainer->fireEvent(DISPID_MouseClickedEvent, &params);
+};
+
+void VLCPlugin::fireOnMouseObjectEvent(VARIANT_BOOL moved)
+{
+    VARIANT varMoved;
+    DISPPARAMS params = { &varMoved, NULL, 1, 0 };
+    varMoved.vt = VT_BOOL;
+    varMoved.boolVal = moved;
+    vlcConnectionPointContainer->fireEvent(DISPID_MouseObjectEvent, &params);
+};
+
+static void handle_mouse_button_pressed_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    VARIANT_BOOL btn_right, btn_center, btn_left, btn_wheel_up, btn_wheel_down;
+#define B(val) ((val) ? 0xFFFF : 0x0000)
+    btn_right = B(event->u.media_player_mouse_button.mb_right);
+    btn_center = B(event->u.media_player_mouse_button.mb_center);
+    btn_left = B(event->u.media_player_mouse_button.mb_left);
+    btn_wheel_up = B(event->u.media_player_mouse_button.mb_wheel_up);
+    btn_wheel_down = B(event->u.media_player_mouse_button.mb_wheel_down);
+#undef B
+    plugin->fireOnMouseButtonEvent(btn_right, btn_center, btn_left,
+                                 btn_wheel_up, btn_wheel_down);
+}
+
+static void handle_mouse_moved_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnMouseMovedEvent(event->u.media_player_mouse_moved.x,
+                                  event->u.media_player_mouse_moved.y);
+}
+
+static void handle_mouse_clicked_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnMouseClickedEvent(event->u.media_player_mouse_clicked.clicked);
+}
+
+static void handle_mouse_object_event(const libvlc_event_t* event, void *param)
+{
+    VLCPlugin *plugin = (VLCPlugin*)param;
+    plugin->fireOnMouseObjectEvent(event->u.media_player_mouse_object.moved);
+}
+
+/* */
+
 bool VLCPlugin::playlist_select( int idx )
 {
     libvlc_media_t *p_m = NULL;
@@ -1018,6 +1269,7 @@ bool VLCPlugin::playlist_select( int idx )
 
     if( _p_mplayer )
     {
+        player_unregister_events();
         libvlc_media_player_release( _p_mplayer );
         _p_mplayer = NULL;
     }
@@ -1030,6 +1282,7 @@ bool VLCPlugin::playlist_select( int idx )
         if( _b_mute )
             libvlc_audio_set_mute(_p_mplayer, TRUE);
         set_player_window();
+        player_register_events();
     }
 
     libvlc_media_release(p_m);
@@ -1046,6 +1299,102 @@ void VLCPlugin::set_player_window()
     libvlc_media_player_set_hwnd(_p_mplayer,getInPlaceWindow());
 }
 
+void VLCPlugin::player_register_events()
+{
+    libvlc_event_manager_t *eventManager = NULL;
+    assert(_p_mplayer);
+
+    eventManager = libvlc_media_player_event_manager(_p_mplayer);
+    if(eventManager) {
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerNothingSpecial,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerOpening,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerBuffering,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerPlaying,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerPaused,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerStopped,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerForward,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerBackward,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerEndReached,
+                            handle_input_state_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerEncounteredError,
+                            handle_input_state_event, this);
+
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerTimeChanged,
+                            handle_time_changed_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerPositionChanged,
+                            handle_position_changed_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerSeekableChanged,
+                            handle_seekable_changed_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerPausableChanged,
+                            handle_pausable_changed_event, this);
+
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseButton,
+                            handle_mouse_button_pressed_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseMoved,
+                            handle_mouse_moved_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseClick,
+                            handle_mouse_clicked_event, this);
+        libvlc_event_attach(eventManager, libvlc_MediaPlayerMouseObject,
+                            handle_mouse_object_event, this);
+    }
+}
+
+void VLCPlugin::player_unregister_events()
+{
+    libvlc_event_manager_t *eventManager = NULL;
+    assert(_p_mplayer);
+
+    eventManager = libvlc_media_player_event_manager(_p_mplayer);
+    if(eventManager) {
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerNothingSpecial,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerOpening,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerBuffering,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerPlaying,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerPaused,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerStopped,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerForward,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerBackward,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerEndReached,
+                            handle_input_state_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerEncounteredError,
+                            handle_input_state_event, this);
+
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerTimeChanged,
+                            handle_time_changed_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerPositionChanged,
+                            handle_position_changed_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerSeekableChanged,
+                            handle_seekable_changed_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerPausableChanged,
+                            handle_pausable_changed_event, this);
+
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseButton,
+                            handle_mouse_button_pressed_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseMoved,
+                            handle_mouse_moved_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseClick,
+                            handle_mouse_clicked_event, this);
+        libvlc_event_detach(eventManager, libvlc_MediaPlayerMouseObject,
+                            handle_mouse_object_event, this);
+    }
+}
+
 int  VLCPlugin::playlist_add_extended_untrusted(const char *mrl, int optc, const char **optv)
 {
     int item = -1;

diff --git a/projects/activex/plugin.h b/projects/activex/plugin.h
index 730c57cbb18dec881d815868e7724ce8bb17b62d..d0776f8617c64f0a0d2eb3d2538755f444453724 100644 (file)
--- a/projects/activex/plugin.h
+++ b/projects/activex/plugin.h
@@ -238,6 +238,30 @@ public:
     void fireOnPauseEvent(void);
     void fireOnStopEvent(void);
 
+    // async events;
+    void fireOnIdleEvent();
+    void fireOnOpeningEvent();
+    void fireOnBufferingEvent();
+    void fireOnPlayingEvent();
+    void fireOnPausedEvent();
+    void fireOnErrorEvent();
+    void fireOnEndedEvent();
+    void fireOnStoppedEvent();
+    void fireOnForwardEvent();
+    void fireOnBackwardEvent();
+
+    void fireOnTimeChangedEvent(long time);
+    void fireOnPositionChangedEvent(long position);
+    void fireOnSeekableChangedEvent(VARIANT_BOOL seekable);
+    void fireOnPausableChangedEvent(VARIANT_BOOL pausable);
+
+    void fireOnMouseButtonEvent(VARIANT_BOOL btn_right, VARIANT_BOOL btn_center,
+                VARIANT_BOOL btn_left, VARIANT_BOOL btn_wheel_up,
+                VARIANT_BOOL bnt_wheel_down);
+    void fireOnMouseMovedEvent(long x, long y);
+    void fireOnMouseClickedEvent(VARIANT_BOOL clicked);
+    void fireOnMouseObjectEvent(VARIANT_BOOL moved);
+
     // controlling IUnknown interface
     LPUNKNOWN pUnkOuter;
 
@@ -316,6 +340,8 @@ private:
     void initVLC();
     bool playlist_select(int i);
     void set_player_window();
+    void player_register_events();
+    void player_unregister_events();
 
     //implemented interfaces
     class VLCOleObject *vlcOleObject;