diff options
| author | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-13 13:19:35 +0200 |
|---|---|---|
| committer | Friedemann Kleint <Friedemann.Kleint@qt.io> | 2018-04-24 13:30:36 +0000 |
| commit | 20e93ad5969d3dff85f0ef9e16830aee337ca075 (patch) | |
| tree | f28235f63ba8a0857f9cf1e890784a104ac3e2d4 /src/plugins/directshow/common/directshowmediatypeenum.h | |
| parent | 6a2f332821ea3d8d4f6c11050d592aef0ad4df7f (diff) | |
Fix DirectShow COM class hierarchy
Remove the class DirectShowObject. Move the ref counting code
to a macro COM_REF_MIXIN that is used for the classes that are
actually instantiated.
Fix warnings:
common/directshowpin.h(56,5): warning: 'reinterpret_cast' from class 'DirectShowPin *' to its base at non-zero offset 'IUnknown *' behaves differently from 'static_cast' [-Wreinterpret-base-class]
DIRECTSHOW_OBJECT
^~~~~~~~~~~~~~~~~
common/directshowobject.h(69,33): note: expanded from macro 'DIRECTSHOW_OBJECT'
return GetInterface(reinterpret_cast<IUnknown*>(this), ppv); \
^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
common/directshowpin.h(56,5): note: use 'static_cast' to adjust the pointer correctly while upcasting
Task-number: QTBUG-63512
Task-number: QTBUG-64157
Change-Id: Ibef143d675cd169b78fe46ff5a0c83f6e3434487
Reviewed-by: VaL Doroshchuk <valentyn.doroshchuk@qt.io>
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Diffstat (limited to 'src/plugins/directshow/common/directshowmediatypeenum.h')
| -rw-r--r-- | src/plugins/directshow/common/directshowmediatypeenum.h | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/src/plugins/directshow/common/directshowmediatypeenum.h b/src/plugins/directshow/common/directshowmediatypeenum.h index 9b058fc5b..ee2568338 100644 --- a/src/plugins/directshow/common/directshowmediatypeenum.h +++ b/src/plugins/directshow/common/directshowmediatypeenum.h @@ -48,18 +48,15 @@ QT_BEGIN_NAMESPACE class DirectShowPin; class DirectShowMediaType; -class DirectShowMediaTypeEnum : public DirectShowObject - , public IEnumMediaTypes +class DirectShowMediaTypeEnum : public IEnumMediaTypes { - DIRECTSHOW_OBJECT - + COM_REF_MIXIN public: DirectShowMediaTypeEnum(DirectShowPin *pin); DirectShowMediaTypeEnum(const QList<DirectShowMediaType> &types); - ~DirectShowMediaTypeEnum(); + virtual ~DirectShowMediaTypeEnum(); - // DirectShowObject - HRESULT getInterface(REFIID riid, void **ppvObject); + STDMETHODIMP QueryInterface(REFIID riid, void **ppv) override; // IEnumMediaTypes STDMETHODIMP Next(ULONG cMediaTypes, AM_MEDIA_TYPE **ppMediaTypes, ULONG *pcFetched); |