Commit 97cf9ab4 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

quartz: Use strmbase filter methods directly.

parent e707bb49
...@@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface) ...@@ -1394,21 +1394,21 @@ static HRESULT WINAPI AVISplitter_seek(IMediaSeeking *iface)
static const IBaseFilterVtbl AVISplitterImpl_Vtbl = static const IBaseFilterVtbl AVISplitterImpl_Vtbl =
{ {
Parser_QueryInterface, BaseFilterImpl_QueryInterface,
Parser_AddRef, BaseFilterImpl_AddRef,
BaseFilterImpl_Release, BaseFilterImpl_Release,
Parser_GetClassID, BaseFilterImpl_GetClassID,
Parser_Stop, Parser_Stop,
Parser_Pause, Parser_Pause,
Parser_Run, Parser_Run,
Parser_GetState, Parser_GetState,
Parser_SetSyncSource, Parser_SetSyncSource,
Parser_GetSyncSource, BaseFilterImpl_GetSyncSource,
Parser_EnumPins, BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin, BaseFilterImpl_FindPin,
Parser_QueryFilterInfo, BaseFilterImpl_QueryFilterInfo,
Parser_JoinFilterGraph, BaseFilterImpl_JoinFilterGraph,
Parser_QueryVendorInfo BaseFilterImpl_QueryVendorInfo,
}; };
static void avi_splitter_destroy(BaseFilter *iface) static void avi_splitter_destroy(BaseFilter *iface)
......
...@@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii ...@@ -794,20 +794,20 @@ static HRESULT WINAPI MPEGSplitter_QueryInterface(IBaseFilter *iface, REFIID rii
static const IBaseFilterVtbl MPEGSplitter_Vtbl = static const IBaseFilterVtbl MPEGSplitter_Vtbl =
{ {
MPEGSplitter_QueryInterface, MPEGSplitter_QueryInterface,
Parser_AddRef, BaseFilterImpl_AddRef,
BaseFilterImpl_Release, BaseFilterImpl_Release,
Parser_GetClassID, BaseFilterImpl_GetClassID,
Parser_Stop, Parser_Stop,
Parser_Pause, Parser_Pause,
Parser_Run, Parser_Run,
Parser_GetState, Parser_GetState,
Parser_SetSyncSource, Parser_SetSyncSource,
Parser_GetSyncSource, BaseFilterImpl_GetSyncSource,
Parser_EnumPins, BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin, BaseFilterImpl_FindPin,
Parser_QueryFilterInfo, BaseFilterImpl_QueryFilterInfo,
Parser_JoinFilterGraph, BaseFilterImpl_JoinFilterGraph,
Parser_QueryVendorInfo BaseFilterImpl_QueryVendorInfo,
}; };
static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv) static HRESULT WINAPI AMStreamSelect_QueryInterface(IAMStreamSelect *iface, REFIID riid, void **ppv)
......
...@@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This) ...@@ -191,19 +191,6 @@ void Parser_Destroy(ParserImpl *This)
CoTaskMemFree(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 **/ /** IMediaFilter methods **/
HRESULT WINAPI Parser_Stop(IBaseFilter * iface) HRESULT WINAPI Parser_Stop(IBaseFilter * iface)
...@@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock ...@@ -362,33 +349,6 @@ HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock
return S_OK; 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 = { static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{ {
Parser_OutputPin_CheckMediaType, Parser_OutputPin_CheckMediaType,
......
...@@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl, ...@@ -61,19 +61,11 @@ HRESULT Parser_Create(ParserImpl *parser, const IBaseFilterVtbl *vtbl,
/* Override the _Release function and call this when releasing */ /* Override the _Release function and call this when releasing */
extern void Parser_Destroy(ParserImpl *This); 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_Stop(IBaseFilter * iface);
extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface); extern HRESULT WINAPI Parser_Pause(IBaseFilter * iface);
extern HRESULT WINAPI Parser_Run(IBaseFilter * iface, REFERENCE_TIME tStart); 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_GetState(IBaseFilter * iface, DWORD dwMilliSecsTimeout, FILTER_STATE *pState);
extern HRESULT WINAPI Parser_SetSyncSource(IBaseFilter * iface, IReferenceClock *pClock); 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; IPin *parser_get_pin(BaseFilter *iface, unsigned int index) DECLSPEC_HIDDEN;
......
...@@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface) ...@@ -396,21 +396,21 @@ static HRESULT WAVEParser_disconnect(LPVOID iface)
static const IBaseFilterVtbl WAVEParser_Vtbl = static const IBaseFilterVtbl WAVEParser_Vtbl =
{ {
Parser_QueryInterface, BaseFilterImpl_QueryInterface,
Parser_AddRef, BaseFilterImpl_AddRef,
BaseFilterImpl_Release, BaseFilterImpl_Release,
Parser_GetClassID, BaseFilterImpl_GetClassID,
Parser_Stop, Parser_Stop,
Parser_Pause, Parser_Pause,
Parser_Run, Parser_Run,
Parser_GetState, Parser_GetState,
Parser_SetSyncSource, Parser_SetSyncSource,
Parser_GetSyncSource, BaseFilterImpl_GetSyncSource,
Parser_EnumPins, BaseFilterImpl_EnumPins,
BaseFilterImpl_FindPin, BaseFilterImpl_FindPin,
Parser_QueryFilterInfo, BaseFilterImpl_QueryFilterInfo,
Parser_JoinFilterGraph, BaseFilterImpl_JoinFilterGraph,
Parser_QueryVendorInfo BaseFilterImpl_QueryVendorInfo,
}; };
static void wave_parser_destroy(BaseFilter *iface) static void wave_parser_destroy(BaseFilter *iface)
......
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