Signed-off-by: Zebediah Figura z.figura12@gmail.com --- dlls/quartz/dsoundrender.c | 4 ---- dlls/strmbase/renderer.c | 15 ++++----------- include/wine/strmbase.h | 1 - 3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 71851f6b4a..3979853b8b 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -520,10 +520,6 @@ static HRESULT WINAPI DSoundRender_EndFlush(struct strmbase_renderer *iface) { DSoundRenderImpl *This = impl_from_strmbase_renderer(iface);
- TRACE("\n"); - - BaseRendererImpl_EndFlush(iface); - if (This->dsbuffer) { LPBYTE buffer; diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 2f09cadf13..5aee4380f2 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -130,10 +130,12 @@ static HRESULT WINAPI BaseRenderer_InputPin_EndFlush(IPin * iface) hr = BaseInputPinImpl_EndFlush(iface); if (SUCCEEDED(hr)) { + QualityControlRender_Start(pFilter->qcimpl, pFilter->stream_start); + RendererPosPassThru_ResetMediaTime(pFilter->pPosition); + ResetEvent(pFilter->flush_event); + if (pFilter->pFuncsTable->pfnEndFlush) hr = pFilter->pFuncsTable->pfnEndFlush(pFilter); - else - hr = BaseRendererImpl_EndFlush(pFilter); } LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); @@ -479,15 +481,6 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) return hr; }
-HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *iface) -{ - TRACE("(%p)\n", iface); - QualityControlRender_Start(iface->qcimpl, iface->stream_start); - RendererPosPassThru_ResetMediaTime(iface->pPosition); - ResetEvent(iface->flush_event); - return S_OK; -} - HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *iface) { if (iface->pMediaSample) diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index cf209ae892..1dbc9ea4d8 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -569,7 +569,6 @@ struct strmbase_renderer_ops
HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); -HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_Receive(struct strmbase_renderer *filter, IMediaSample *sample);
HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,