Commit 24bfac7d authored by Hugo Beauzée-Luyssen's avatar Hugo Beauzée-Luyssen

activex: Rename versionInfo method

This make the build fail with MSVC, since it is case insensitive, and therefore conflicts with the versionInfo method
refs #14239 #14271
parent 1ee9e21e
...@@ -81,6 +81,7 @@ library AXVLC ...@@ -81,6 +81,7 @@ library AXVLC
const int DISPID_BaseURL = 110; const int DISPID_BaseURL = 110;
const int DISPID_Toolbar = 111; const int DISPID_Toolbar = 111;
const int DISPID_FSEnabled = 112; const int DISPID_FSEnabled = 112;
const int DISPID_Version = 113;
[ [
odl, odl,
...@@ -663,11 +664,11 @@ library AXVLC ...@@ -663,11 +664,11 @@ library AXVLC
[id(DISPID_MRL), propput, helpstring("Returns/sets the default MRL in playlist")] [id(DISPID_MRL), propput, helpstring("Returns/sets the default MRL in playlist")]
HRESULT MRL([in] BSTR mrl); HRESULT MRL([in] BSTR mrl);
[propget, helpstring("Returns VLC Version.")] [propget, helpstring("Returns the VLC version")]
HRESULT VersionInfo([out, retval] BSTR* version); HRESULT VersionInfo([out, retval] BSTR* version);
[helpstring("Returns VLC Version.")] [helpstring("Returns the VLC version")]
HRESULT versionInfo([out, retval] BSTR* version); HRESULT getVersionInfo([out, retval] BSTR* version);
[id(DISPID_Visible), propget, helpstring("Returns/sets a value that determines whether viewing area is visible or hidden.")] [id(DISPID_Visible), propget, helpstring("Returns/sets a value that determines whether viewing area is visible or hidden.")]
HRESULT Visible([out, retval] VARIANT_BOOL* visible); HRESULT Visible([out, retval] VARIANT_BOOL* visible);
......
...@@ -1204,22 +1204,12 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version) ...@@ -1204,22 +1204,12 @@ STDMETHODIMP VLCControl2::get_VersionInfo(BSTR *version)
return E_FAIL; return E_FAIL;
}; };
STDMETHODIMP VLCControl2::versionInfo(BSTR *version) STDMETHODIMP VLCControl2::getVersionInfo(BSTR *version)
{ {
if( NULL == version ) return get_VersionInfo(version);
return E_POINTER;
const char *versionStr = libvlc_get_version();
if( NULL != versionStr )
{
*version = BSTRFromCStr(CP_UTF8, versionStr);
return (NULL == *version) ? E_OUTOFMEMORY : NOERROR;
}
*version = NULL;
return E_FAIL;
}; };
STDMETHODIMP VLCControl2::get_Visible(VARIANT_BOOL *isVisible) STDMETHODIMP VLCControl2::get_Visible(VARIANT_BOOL *isVisible)
{ {
if( NULL == isVisible ) if( NULL == isVisible )
......
...@@ -364,7 +364,7 @@ public: ...@@ -364,7 +364,7 @@ public:
virtual ~VLCControl2(); virtual ~VLCControl2();
// IUnknown methods // IUnknown methods
STDMETHODIMP QueryInterface(REFIID riid, void **ppv) STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override
{ {
if( NULL == ppv ) if( NULL == ppv )
return E_POINTER; return E_POINTER;
...@@ -402,7 +402,7 @@ public: ...@@ -402,7 +402,7 @@ public:
STDMETHODIMP get_StartTime(long *seconds); STDMETHODIMP get_StartTime(long *seconds);
STDMETHODIMP put_StartTime(long seconds); STDMETHODIMP put_StartTime(long seconds);
STDMETHODIMP get_VersionInfo(BSTR *version); STDMETHODIMP get_VersionInfo(BSTR *version);
STDMETHODIMP versionInfo(BSTR *version); STDMETHODIMP getVersionInfo(BSTR *version);
STDMETHODIMP get_Visible(VARIANT_BOOL *visible); STDMETHODIMP get_Visible(VARIANT_BOOL *visible);
STDMETHODIMP put_Visible(VARIANT_BOOL visible); STDMETHODIMP put_Visible(VARIANT_BOOL visible);
STDMETHODIMP get_Volume(long *volume); STDMETHODIMP get_Volume(long *volume);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment