npapi-vlc | branch: master | Daniel Amm <da2...@t-online.de> | Tue Jun 2 20:55:14 2015 +0200| [15ae16420132dfd248a29957ab3fa5825c6ba859] | committer: Jean-Baptiste Kempf
activex: remove useless events These are remnants of the old v1 activex plugin Signed-off-by: Jean-Baptiste Kempf <j...@videolan.org> > http://git.videolan.org/gitweb.cgi/npapi-vlc.git/?a=commit;h=15ae16420132dfd248a29957ab3fa5825c6ba859 --- activex/axvlc.idl | 14 +------------- activex/plugin.cpp | 21 --------------------- activex/plugin.h | 4 ---- 3 files changed, 1 insertion(+), 38 deletions(-) diff --git a/activex/axvlc.idl b/activex/axvlc.idl index 89b3564..8f3ca34 100644 --- a/activex/axvlc.idl +++ b/activex/axvlc.idl @@ -63,11 +63,6 @@ library AXVLC const int DISPID_Visible = 100; - - const int DISPID_PlayEvent = 100; - const int DISPID_PauseEvent = 101; - const int DISPID_StopEvent = 102; - /* async events from libvlc */ const int DISPID_MediaPlayerNothingSpecialEvent = 200; const int DISPID_MediaPlayerOpeningEvent = 201; @@ -96,14 +91,7 @@ library AXVLC { properties: methods: - [id(DISPID_PlayEvent), helpstring("Playing")] - void play(); - [id(DISPID_PauseEvent), helpstring("Paused")] - void pause(); - [id(DISPID_StopEvent), helpstring("Stopped")] - void stop(); - - /* asyn events from libvlc */ + /* async events from libvlc */ [id(DISPID_MediaPlayerNothingSpecialEvent), helpstring("Idle state")] void MediaPlayerNothingSpecial(); [id(DISPID_MediaPlayerOpeningEvent), helpstring("Opening media")] diff --git a/activex/plugin.cpp b/activex/plugin.cpp index 96acacc..e46edcb 100644 --- a/activex/plugin.cpp +++ b/activex/plugin.cpp @@ -705,10 +705,7 @@ BOOL VLCPlugin::getFullscreen() HRESULT VLCPlugin::onInPlaceDeactivate(void) { if( m_player.mlp().isPlaying() ) - { m_player.mlp().stop(); - fireOnStopEvent(); - } _WindowsManager.DestroyWindows(); @@ -957,24 +954,6 @@ void VLCPlugin::firePropChangedEvent(DISPID dispid) vlcConnectionPointContainer->firePropChangedEvent(dispid); }; -void VLCPlugin::fireOnPlayEvent(void) -{ - DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; - vlcConnectionPointContainer->fireEvent(DISPID_PlayEvent, &dispparamsNoArgs); -}; - -void VLCPlugin::fireOnPauseEvent(void) -{ - DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; - vlcConnectionPointContainer->fireEvent(DISPID_PauseEvent, &dispparamsNoArgs); -}; - -void VLCPlugin::fireOnStopEvent(void) -{ - DISPPARAMS dispparamsNoArgs = {NULL, NULL, 0, 0}; - vlcConnectionPointContainer->fireEvent(DISPID_StopEvent, &dispparamsNoArgs); -}; - /* * Async events */ diff --git a/activex/plugin.h b/activex/plugin.h index 6364c34..1f2dbd6 100644 --- a/activex/plugin.h +++ b/activex/plugin.h @@ -242,10 +242,6 @@ public: */ void freezeEvents(BOOL freeze); void firePropChangedEvent(DISPID dispid); - //FIXME: I'm fairly convinced this 3 events are useless. - void fireOnPlayEvent(void); - void fireOnPauseEvent(void); - void fireOnStopEvent(void); // async events; void fireOnMediaPlayerNothingSpecialEvent(); _______________________________________________ vlc-commits mailing list vlc-commits@videolan.org https://mailman.videolan.org/listinfo/vlc-commits