plugin.cpp: formatting

supportinfo: use static IIDs as previous method wouldn't work in a multithreaded environment

diff --git a/activex/plugin.cpp b/activex/plugin.cpp
index 1b9e1c69413a9bc607913e249a301ce07801e8dd..cc289b92459643095f3e826a738b704b0e17d1bc 100644 (file)
--- a/activex/plugin.cpp
+++ b/activex/plugin.cpp
@@ -494,7 +494,7 @@ HRESULT VLCPlugin::getVLC(libvlc_instance_t** pp_libvlc)
         libvlc_audio_set_volume(_p_libvlc, _i_volume, NULL);
         if( _b_mute )
         {
-           libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
+            libvlc_audio_set_mute(_p_libvlc, TRUE, NULL);
         }
             
         // initial playlist item

diff --git a/activex/supporterrorinfo.cpp b/activex/supporterrorinfo.cpp
index 1dbc9a5df51be5e9731f01b606098a8bebf04608..6982558b9a05e91ad4867ef34d0580ee7433ae41 100755 (executable)
--- a/activex/supporterrorinfo.cpp
+++ b/activex/supporterrorinfo.cpp
@@ -24,20 +24,25 @@
 #include "supporterrorinfo.h"
 
 #include "utils.h"
+#include "axvlc_idl.h"
 
 using namespace std;
 
 STDMETHODIMP VLCSupportErrorInfo::InterfaceSupportsErrorInfo(REFIID  riid)
 {
-    if( IID_NULL == riid )
-        return S_FALSE;
-
-    return riid == _riid ? S_OK : S_FALSE;
+    if( (riid == IID_IVLCAudio)
+     || (riid == IID_IVLCInput)
+     || (riid == IID_IVLCPlaylist)
+     || (riid == IID_IVLCVideo)
+     || (riid == IID_IVLCControl2) )
+    {
+        return S_OK;
+    }
+    return S_FALSE;
 };
 
 void VLCSupportErrorInfo::setErrorInfo(LPCOLESTR progid, REFIID riid, const char *description)
 {
-    _riid = IID_NULL;
     BSTR bstrDescription = BSTRFromCStr(CP_UTF8, description);
     if( NULL != bstrDescription )
     {
@@ -54,7 +59,6 @@ void VLCSupportErrorInfo::setErrorInfo(LPCOLESTR progid, REFIID riid, const char
             hr = pcerrinfo->QueryInterface(IID_IErrorInfo, (LPVOID*) &perrinfo);
             if( SUCCEEDED(hr) )
             {
-               _riid = riid;
                ::SetErrorInfo(0, perrinfo);
                perrinfo->Release();
             }

diff --git a/activex/supporterrorinfo.h b/activex/supporterrorinfo.h
index 61af99716ce53161787d62d559d4b39c626a20ab..754f3fb596514339f60b906d1cd80853e7c86fff 100755 (executable)
--- a/activex/supporterrorinfo.h
+++ b/activex/supporterrorinfo.h
@@ -31,8 +31,7 @@ class VLCSupportErrorInfo : public ISupportErrorInfo
 public:
 
     VLCSupportErrorInfo(VLCPlugin *p_instance) :
-        _p_instance(p_instance),
-        _riid(IID_NULL)
+        _p_instance(p_instance)
     {};
     virtual ~VLCSupportErrorInfo()
     {};
@@ -63,7 +62,6 @@ public:
 
 private:
     VLCPlugin *_p_instance;
-    IID _riid;
 };
 
 #endif