strmbase: Get rid of BaseRendererImpl_EndFlush().

Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

strmbase: Get rid of BaseRendererImpl_EndFlush().
dc8bd459 · Zebediah Figura · Alexandre Julliard · 0011be7f · dc8bd459 · dc8bd459
Commit dc8bd459 authored Nov 27, 2019 by Zebediah Figura Committed by Alexandre Julliard Nov 28, 2019
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 16 deletions

dsoundrender.c dlls/quartz/dsoundrender.c +0 -4

renderer.c dlls/strmbase/renderer.c +4 -11

strmbase.h include/wine/strmbase.h +0 -1

No files found.
--- 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;

--- 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)

--- 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,