sync libvlc_MediaPlayer events between activex and mozilla

projects/activex/axvlc.idl

@@ -169,26 +169,26 @@ library AXVLC
     const int DISPID_StopEvent  = 102;
 
     /* async events from libvlc */
-    const int DISPID_NothingSpecialEvent = 200;
-    const int DISPID_OpeningEvent = 201;
-    const int DISPID_BufferingEvent = 202;
-    const int DISPID_PlayingEvent = 203;
-    const int DISPID_PausedEvent = 204;
-    const int DISPID_ForwardEvent = 205;
-    const int DISPID_BackwardEvent = 206;
-    const int DISPID_EncounteredErrorEvent = 207;
-    const int DISPID_EndReachedEvent = 208;
-    const int DISPID_StoppedEvent = 209;
-
-    const int DISPID_TimeChangedEvent = 210;
-    const int DISPID_PositionChangedEvent = 211;
-    const int DISPID_SeekableChangedEvent = 212;
-    const int DISPID_PausableChangedEvent = 213;
-
-    const int DISPID_MouseButtonEvent = 214;
-    const int DISPID_MouseMovedEvent = 215;
-    const int DISPID_MouseClickedEvent = 216;
-    const int DISPID_MouseGrabEvent = 217;
+    const int DISPID_MediaPlayerNothingSpecialEvent = 200;
+    const int DISPID_MediaPlayerOpeningEvent = 201;
+    const int DISPID_MediaPlayerBufferingEvent = 202;
+    const int DISPID_MediaPlayerPlayingEvent = 203;
+    const int DISPID_MediaPlayerPausedEvent = 204;
+    const int DISPID_MediaPlayerForwardEvent = 205;
+    const int DISPID_MediaPlayerBackwardEvent = 206;
+    const int DISPID_MediaPlayerEncounteredErrorEvent = 207;
+    const int DISPID_MediaPlayerEndReachedEvent = 208;
+    const int DISPID_MediaPlayerStoppedEvent = 209;
+
+    const int DISPID_MediaPlayerTimeChangedEvent = 210;
+    const int DISPID_MediaPlayerPositionChangedEvent = 211;
+    const int DISPID_MediaPlayerSeekableChangedEvent = 212;
+    const int DISPID_MediaPlayerPausableChangedEvent = 213;
+
+    const int DISPID_MediaPlayerMouseButtonEvent = 214;
+    const int DISPID_MediaPlayerMouseMovedEvent = 215;
+    const int DISPID_MediaPlayerMouseClickedEvent = 216;
+    const int DISPID_MediaPlayerMouseGrabEvent = 217;
 
     [
       uuid(DF48072F-5EF8-434e-9B40-E2F3AE759B5F),
@@ -206,46 +206,46 @@ library AXVLC
             void stop();
 
             /* asyn events from libvlc */
-            [id(DISPID_NothingSpecialEvent), helpstring("Idle state")]
-            void idle();
-            [id(DISPID_OpeningEvent), helpstring("Opening media")]
-            void opening();
-            [id(DISPID_BufferingEvent), helpstring("Buffering media")]
-            void buffering();
-            [id(DISPID_PlayingEvent), helpstring("Media is playing")]
-            void playing();
-            [id(DISPID_PausedEvent), helpstring("Media is paused")]
-            void paused();
-            [id(DISPID_ForwardEvent), helpstring("Forward playback")]
-            void forward();
-            [id(DISPID_BackwardEvent), helpstring("Backward playback")]
-            void backward();
-            [id(DISPID_EncounteredErrorEvent), helpstring("An error has been encountered")]
-            void error();
-            [id(DISPID_EndReachedEvent), helpstring("End of playback reached")]
-            void ended();
-            [id(DISPID_StoppedEvent), helpstring("Playback stopped")]
-            void stopped();
-
-            [id(DISPID_TimeChangedEvent), helpstring("Time changed")]
-            void TimeChanged([in] long time);
-            [id(DISPID_PositionChangedEvent), helpstring("Position changed")]
-            void PositionChanged([in] long position);
-            [id(DISPID_SeekableChangedEvent), helpstring("Seek changed")]
-            void SeekableChanged([in] VARIANT_BOOL seekable);
-            [id(DISPID_PausableChangedEvent), helpstring("Pause setting changed")]
-            void PausableChanged([in] VARIANT_BOOL pausable);
-
-            [id(DISPID_MouseButtonEvent), helpstring("Mouse button pressed")]
-            void MouseButton([in] VARIANT_BOOL btn_right, [in] VARIANT_BOOL btn_center,
+            [id(DISPID_MediaPlayerNothingSpecialEvent), helpstring("Idle state")]
+            void MediaPlayerNothingSpecial();
+            [id(DISPID_MediaPlayerOpeningEvent), helpstring("Opening media")]
+            void MediaPlayerOpening();
+            [id(DISPID_MediaPlayerBufferingEvent), helpstring("Buffering media")]
+            void MediaPlayerBuffering();
+            [id(DISPID_MediaPlayerPlayingEvent), helpstring("Media is playing")]
+            void MediaPlayerPlaying();
+            [id(DISPID_MediaPlayerPausedEvent), helpstring("Media is paused")]
+            void MediaPlayerPaused();
+            [id(DISPID_MediaPlayerForwardEvent), helpstring("Forward playback")]
+            void MediaPlayerForward();
+            [id(DISPID_MediaPlayerBackwardEvent), helpstring("Backward playback")]
+            void MediaPlayerBackward();
+            [id(DISPID_MediaPlayerEncounteredErrorEvent), helpstring("An error has been encountered")]
+            void MediaPlayerEncounteredError();
+            [id(DISPID_MediaPlayerEndReachedEvent), helpstring("End of playback reached")]
+            void MediaPlayerEndReached();
+            [id(DISPID_MediaPlayerStoppedEvent), helpstring("Playback stopped")]
+            void MediaPlayerStopped();
+
+            [id(DISPID_MediaPlayerTimeChangedEvent), helpstring("Time changed")]
+            void MediaPlayerTimeChanged([in] long time);
+            [id(DISPID_MediaPlayerPositionChangedEvent), helpstring("Position changed")]
+            void MediaPlayerPositionChanged([in] long position);
+            [id(DISPID_MediaPlayerSeekableChangedEvent), helpstring("Seek changed")]
+            void MediaPlayerSeekableChanged([in] VARIANT_BOOL seekable);
+            [id(DISPID_MediaPlayerPausableChangedEvent), helpstring("Pause setting changed")]
+            void MediaPlayerPausableChanged([in] VARIANT_BOOL pausable);
+
+            [id(DISPID_MediaPlayerMouseButtonEvent), helpstring("Mouse button pressed")]
+            void MediaPlayerMouseButton([in] VARIANT_BOOL btn_right, [in] VARIANT_BOOL btn_center,
                 [in] VARIANT_BOOL btn_left, [in] VARIANT_BOOL btn_wheel_up,
                 [in] VARIANT_BOOL bnt_wheel_down);
-            [id(DISPID_MouseMovedEvent), helpstring("Mouse moved")]
-            void MouseMoved([in] long x, [in] long y);
-            [id(DISPID_MouseClickedEvent), helpstring("Mouse clicked")]
-            void MouseClicked([in] long x, [in] long y);
-            [id(DISPID_MouseGrabEvent), helpstring("Mouse grabs object in video output")]
-            void MouseGrab([in] long x, [in] long y);
+            [id(DISPID_MediaPlayerMouseMovedEvent), helpstring("Mouse moved")]
+            void MediaPlayerMouseMoved([in] long x, [in] long y);
+            [id(DISPID_MediaPlayerMouseClickedEvent), helpstring("Mouse clicked")]
+            void MediaPlayerMouseClicked([in] long x, [in] long y);
+            [id(DISPID_MediaPlayerMouseGrabEvent), helpstring("Mouse grabs object in video output")]
+            void MediaPlayerMouseGrab([in] long x, [in] long y);
     };
 
     [

projects/activex/axvlc_idl.h

@@ -793,41 +793,41 @@ void __RPC_STUB IVLCControl_put_AutoLoop_Stub(
 
 #define DISPID_StopEvent (102)
 
-#define DISPID_NothingSpecialEvent (200)
+#define DISPID_MediaPlayerNothingSpecialEvent (200)
 
-#define DISPID_OpeningEvent (201)
+#define DISPID_MediaPlayerOpeningEvent (201)
 
-#define DISPID_BufferingEvent (202)
+#define DISPID_MediaPlayerBufferingEvent (202)
 
-#define DISPID_PlayingEvent (203)
+#define DISPID_MediaPlayerPlayingEvent (203)
 
-#define DISPID_PausedEvent (204)
+#define DISPID_MediaPlayerPausedEvent (204)
 
-#define DISPID_ForwardEvent (205)
+#define DISPID_MediaPlayerForwardEvent (205)
 
-#define DISPID_BackwardEvent (206)
+#define DISPID_MediaPlayerBackwardEvent (206)
 
-#define DISPID_EncounteredErrorEvent (207)
+#define DISPID_MediaPlayerEncounteredErrorEvent (207)
 
-#define DISPID_EndReachedEvent (208)
+#define DISPID_MediaPlayerEndReachedEvent (208)
 
-#define DISPID_StoppedEvent (209)
+#define DISPID_MediaPlayerStoppedEvent (209)
 
-#define DISPID_TimeChangedEvent (210)
+#define DISPID_MediaPlayerTimeChangedEvent (210)
 
-#define DISPID_PositionChangedEvent (211)
+#define DISPID_MediaPlayerPositionChangedEvent (211)
 
-#define DISPID_SeekableChangedEvent (212)
+#define DISPID_MediaPlayerSeekableChangedEvent (212)
 
-#define DISPID_PausableChangedEvent (213)
+#define DISPID_MediaPlayerPausableChangedEvent (213)
 
-#define DISPID_MouseButtonEvent (214)
+#define DISPID_MediaPlayerMouseButtonEvent (214)
 
-#define DISPID_MouseMovedEvent (215)
+#define DISPID_MediaPlayerMouseMovedEvent (215)
 
-#define DISPID_MouseClickedEvent (216)
+#define DISPID_MediaPlayerMouseClickedEvent (216)
 
-#define DISPID_MouseGrabEvent (217)
+#define DISPID_MediaPlayerMouseGrabEvent (217)
 
 /*****************************************************************************
  * DVLCEvents dispinterface

projects/activex/plugin.h

@@ -239,28 +239,28 @@ public:
     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,
+    void fireOnMediaPlayerNothingSpecialEvent();
+    void fireOnMediaPlayerOpeningEvent();
+    void fireOnMediaPlayerBufferingEvent();
+    void fireOnMediaPlayerPlayingEvent();
+    void fireOnMediaPlayerPausedEvent();
+    void fireOnMediaPlayerForwardEvent();
+    void fireOnMediaPlayerBackwardEvent();
+    void fireOnMediaPlayerEncounteredErrorEvent();
+    void fireOnMediaPlayerEndReachedEvent();
+    void fireOnMediaPlayerStoppedEvent();
+
+    void fireOnMediaPlayerTimeChangedEvent(long time);
+    void fireOnMediaPlayerPositionChangedEvent(long position);
+    void fireOnMediaPlayerSeekableChangedEvent(VARIANT_BOOL seekable);
+    void fireOnMediaPlayerPausableChangedEvent(VARIANT_BOOL pausable);
+
+    void fireOnMediaPlayerMouseButtonEvent(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(long x, long y);
-    void fireOnMouseGrabEvent(long x, long y);
+    void fireOnMediaPlayerMouseMovedEvent(long x, long y);
+    void fireOnMediaPlayerMouseClickedEvent(long x, long y);
+    void fireOnMediaPlayerMouseGrabEvent(long x, long y);
 
     // controlling IUnknown interface
     LPUNKNOWN pUnkOuter;

src/control/event.c

 /*****************************************************************************
  * event.c: New libvlc event control API
  *****************************************************************************
- * Copyright (C) 2007 the VideoLAN team
+ * Copyright (C) 2007-2010 the VideoLAN team
  * $Id $
  *
  * Authors: Filippo Carone <filippo@carone.org>
@@ -274,6 +274,10 @@ static const event_name_t event_list[] = {
     DEF(MediaPlayerTitleChanged)
     DEF(MediaPlayerSnapshotTaken)
     DEF(MediaPlayerLengthChanged)
+    DEF(MediaPlayerMouseMoved)
+    DEF(MediaPlayerMouseButton)
+    DEF(MediaPlayerMouseClick)
+    DEF(MediaPlayerMouseGrab)
 
     DEF(MediaListItemAdded)
     DEF(MediaListWillAddItem)