[PATCH 3/5] quartz: Use strmbase filter methods directly.
Zebediah Figura
z.figura12 at gmail.com
Tue May 28 23:10:18 CDT 2019
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/quartz/avisplit.c | 16 ++++++++--------
dlls/quartz/mpegsplit.c | 14 +++++++-------
dlls/quartz/parser.c | 40 ----------------------------------------
dlls/quartz/parser.h | 8 --------
dlls/quartz/waveparser.c | 16 ++++++++--------
5 files changed, 23 insertions(+), 71 deletions(-)
diff --git a/dlls/quartz/avisplit.c b/dlls/quartz/avisplit.c
index f77efa37c5a..d5b716c1142 100644
--- a/dlls/quartz/avisplit.c
+++ b/dlls/quartz/avisplit.c
@@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface)
static const IBaseFilterVtbl AVISplitterImpl_Vtbl =
{
- Parser_QueryInterface,
- Parser_AddRef,
+ BaseFilterImpl_QueryInterface,
+ BaseFilterImpl_AddRef,
BaseFilterImpl_Release,
- Parser_GetClassID,
+ BaseFilterImpl_GetClassID,
Parser_Stop,
Parser_Pause,
Parser_Run,
Parser_GetState,
Parser_SetSyncSource,
- Parser_GetSyncSource,
- Parser_EnumPins,
+ BaseFilterImpl_GetSyncSource,
+ BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin,
- Parser_QueryFilterInfo,
- Parser_JoinFilterGraph,
- Parser_QueryVendorInfo
+ BaseFilterImpl_QueryFilterInfo,
+ BaseFilterImpl_JoinFilterGraph,
+ BaseFilterImpl_QueryVendorInfo,
};
static void avi_splitter_destroy(BaseFilter *iface)
diff --git a/dlls/quartz/mpegsplit.c b/dlls/quartz/mpegsplit.c
index b64385bf5d8..0afdcbdf3b0 100644
--- a/dlls/quartz/mpegsplit.c
+++ b/dlls/quartz/mpegsplit.c
@@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii
static const IBaseFilterVtbl MPEGSplitter_Vtbl =
{
MPEGSplitter_QueryInterface,
- Parser_AddRef,
+ BaseFilterImpl_AddRef,
BaseFilterImpl_Release,
- Parser_GetClassID,
+ BaseFilterImpl_GetClassID,
Parser_Stop,
Parser_Pause,
Parser_Run,
Parser_GetState,
Parser_SetSyncSource,
- Parser_GetSyncSource,
- Parser_EnumPins,
+ BaseFilterImpl_GetSyncSource,
+ BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin,
- Parser_QueryFilterInfo,
- Parser_JoinFilterGraph,
- Parser_QueryVendorInfo
+ BaseFilterImpl_QueryFilterInfo,
+ BaseFilterImpl_JoinFilterGraph,
+ BaseFilterImpl_QueryVendorInfo,
};
static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv)
diff --git a/dlls/quartz/parser.c b/dlls/quartz/parser.c
index 095ec5eb17b..4a3bc2e7469 100644
--- a/dlls/quartz/parser.c
+++ b/dlls/quartz/parser.c
@@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This)
CoTaskMemFree(This);
}
-/** IPersist methods **/
-
-HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid)
-{
- ParserImpl *This = impl_from_IBaseFilter(iface);
-
- TRACE("%p->(%p)\n", This, pClsid);
-
- *pClsid = This->filter.clsid;
-
- return S_OK;
-}
-
/** IMediaFilter methods **/
HRESULT WINAPI Parser_Stop(IBaseFilter * iface)
@@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock
return S_OK;
}
-HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock)
-{
- return BaseFilterImpl_GetSyncSource(iface, ppClock);
-}
-
-/** IBaseFilter implementation **/
-
-HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum)
-{
- return BaseFilterImpl_EnumPins(iface,ppEnum);
-}
-
-HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo)
-{
- return BaseFilterImpl_QueryFilterInfo(iface, pInfo);
-}
-
-HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName)
-{
- return BaseFilterImpl_JoinFilterGraph(iface, pGraph, pName);
-}
-
-HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)
-{
- return BaseFilterImpl_QueryVendorInfo(iface, pVendorInfo);
-}
-
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
Parser_OutputPin_CheckMediaType,
diff --git a/dlls/quartz/parser.h b/dlls/quartz/parser.h
index 4d51e3afd83..aeeb55a85f2 100644
--- a/dlls/quartz/parser.h
+++ b/dlls/quartz/parser.h
@@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl,
/* Override the _Release function and call this when releasing */
extern void Parser_Destroy(ParserImpl *This);
-extern HRESULT WINAPI Parser_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);
-extern ULONG WINAPI Parser_AddRef(IBaseFilter * iface);
-extern HRESULT WINAPI Parser_GetClassID(IBaseFilter * iface, CLSID * pClsid);
extern HRESULT WINAPI Parser_Stop(IBaseFilter * iface);
extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface);
extern HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart);
extern HRESULT WINAPI Parser_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState);
extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock);
-extern HRESULT WINAPI Parser_GetSyncSource(IBaseFilter * iface, IReferenceClock **ppClock);
-extern HRESULT WINAPI Parser_EnumPins(IBaseFilter * iface, IEnumPins **ppEnum);
-extern HRESULT WINAPI Parser_QueryFilterInfo(IBaseFilter * iface, FILTER_INFO *pInfo);
-extern HRESULT WINAPI Parser_JoinFilterGraph(IBaseFilter * iface, IFilterGraph *pGraph, LPCWSTR pName);
-extern HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo);
IPin *parser_get_pin(BaseFilter *iface, unsigned int index) DECLSPEC_HIDDEN;
diff --git a/dlls/quartz/waveparser.c b/dlls/quartz/waveparser.c
index 1b18f69241e..7cc01afecb0 100644
--- a/dlls/quartz/waveparser.c
+++ b/dlls/quartz/waveparser.c
@@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface)
static const IBaseFilterVtbl WAVEParser_Vtbl =
{
- Parser_QueryInterface,
- Parser_AddRef,
+ BaseFilterImpl_QueryInterface,
+ BaseFilterImpl_AddRef,
BaseFilterImpl_Release,
- Parser_GetClassID,
+ BaseFilterImpl_GetClassID,
Parser_Stop,
Parser_Pause,
Parser_Run,
Parser_GetState,
Parser_SetSyncSource,
- Parser_GetSyncSource,
- Parser_EnumPins,
+ BaseFilterImpl_GetSyncSource,
+ BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin,
- Parser_QueryFilterInfo,
- Parser_JoinFilterGraph,
- Parser_QueryVendorInfo
+ BaseFilterImpl_QueryFilterInfo,
+ BaseFilterImpl_JoinFilterGraph,
+ BaseFilterImpl_QueryVendorInfo,
};
static void wave_parser_destroy(BaseFilter *iface)
--
2.21.0
More information about the wine-devel
mailing list