fix seg'faulty sout_StreamChainDelete ordering

[vlc] / projects / activex / vlccontrol.cpp

diff --git a/projects/activex/vlccontrol.cpp b/projects/activex/vlccontrol.cpp
index 266b46ce949b91002e4b40dcae37ed591f0b9552..a7634eb4a3b03e7a96f8dde22aa7ff4a838e3fb7 100644 (file)
--- a/projects/activex/vlccontrol.cpp
+++ b/projects/activex/vlccontrol.cpp
@@ -160,7 +160,7 @@ STDMETHODIMP VLCControl::stop(void)
         libvlc_exception_t ex;
         libvlc_exception_init(&ex);
 
-        libvlc_media_player_stop(p_md, &ex);
+        libvlc_media_player_stop(p_md);
         result = exception_bridge(&ex);
         if( SUCCEEDED(result) )
             _p_instance->fireOnStopEvent();
@@ -177,7 +177,7 @@ STDMETHODIMP VLCControl::get_Playing(VARIANT_BOOL *isPlaying)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        *isPlaying = libvlc_media_player_is_playing(p_md, NULL) ?
+        *isPlaying = libvlc_media_player_is_playing(p_md) ?
                      VARIANT_TRUE : VARIANT_FALSE;
     } else *isPlaying = VARIANT_FALSE;
     return result;
@@ -266,7 +266,7 @@ STDMETHODIMP VLCControl::fullscreen(void)
     HRESULT result = _p_instance->getMD(&p_md);
     if( SUCCEEDED(result) )
     {
-        if( libvlc_media_player_is_playing(p_md, NULL) )
+        if( libvlc_media_player_is_playing(p_md) )
         {
             libvlc_toggle_fullscreen(p_md, NULL);
         }
@@ -349,13 +349,7 @@ STDMETHODIMP VLCControl::toggleMute(void)
     libvlc_instance_t* p_libvlc;
     HRESULT result = _p_instance->getVLC(&p_libvlc);
     if( SUCCEEDED(result) )
-    {
-        libvlc_exception_t ex;
-        libvlc_exception_init(&ex);
-
-        libvlc_audio_toggle_mute(p_libvlc, &ex);
-        result = exception_bridge(&ex);
-    }
+        libvlc_audio_toggle_mute(p_libvlc);
     return result;
 };