diff options
Diffstat (limited to 'src/plugins/directshow/common/directshowpin.h')
-rw-r--r-- | src/plugins/directshow/common/directshowpin.h | 25 |
1 files changed, 6 insertions, 19 deletions
diff --git a/src/plugins/directshow/common/directshowpin.h b/src/plugins/directshow/common/directshowpin.h index 97e808384..9598cf525 100644 --- a/src/plugins/directshow/common/directshowpin.h +++ b/src/plugins/directshow/common/directshowpin.h @@ -50,11 +50,8 @@ QT_BEGIN_NAMESPACE class DirectShowBaseFilter; -class DirectShowPin : public DirectShowObject - , public IPin +class DirectShowPin : public IPin { - DIRECTSHOW_OBJECT - public: virtual ~DirectShowPin(); @@ -70,9 +67,6 @@ public: virtual HRESULT setActive(bool active); - // DirectShowObject - HRESULT getInterface(REFIID riid, void **ppvObject); - // IPin STDMETHODIMP Connect(IPin *pReceivePin, const AM_MEDIA_TYPE *pmt); STDMETHODIMP ReceiveConnection(IPin *pConnector, const AM_MEDIA_TYPE *pmt); @@ -120,18 +114,16 @@ private: class DirectShowOutputPin : public DirectShowPin { - DIRECTSHOW_OBJECT - public: - virtual ~DirectShowOutputPin(); + ~DirectShowOutputPin() override; // DirectShowPin - virtual HRESULT completeConnection(IPin *pin); - virtual HRESULT connectionEnded(); - virtual HRESULT setActive(bool active); + HRESULT completeConnection(IPin *pin) override; + HRESULT connectionEnded() override; + HRESULT setActive(bool active) override; // IPin - STDMETHODIMP EndOfStream(); + STDMETHODIMP EndOfStream() override; protected: DirectShowOutputPin(DirectShowBaseFilter *filter, const QString &name); @@ -147,16 +139,11 @@ private: class DirectShowInputPin : public DirectShowPin , public IMemInputPin { - DIRECTSHOW_OBJECT - public: virtual ~DirectShowInputPin(); const AM_SAMPLE2_PROPERTIES *currentSampleProperties() const { return &m_sampleProperties; } - // DirectShowObject - HRESULT getInterface(REFIID riid, void **ppvObject); - // DirectShowPin HRESULT connectionEnded(); HRESULT setActive(bool active); |