Zebediah Figura : strmbase: Get rid of BaseRendererImpl_BeginFlush().
Module: wine Branch: master Commit: 0011be7fdd606134c6c155552e9aeea227a120af URL: https://source.winehq.org/git/wine.git/?a=commit;h=0011be7fdd606134c6c155552... Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed Nov 27 19:27:15 2019 -0600 strmbase: Get rid of BaseRendererImpl_BeginFlush(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/strmbase/renderer.c | 13 ++++--------- include/wine/strmbase.h | 1 - 2 files changed, 4 insertions(+), 10 deletions(-) diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index 98d27cc83a..2f09cadf13 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -108,7 +108,10 @@ static HRESULT WINAPI BaseRenderer_InputPin_BeginFlush(IPin * iface) EnterCriticalSection(&pFilter->filter.csFilter); hr = BaseInputPinImpl_BeginFlush(iface); if (SUCCEEDED(hr)) - hr = BaseRendererImpl_BeginFlush(pFilter); + { + BaseRendererImpl_ClearPendingSample(pFilter); + SetEvent(pFilter->flush_event); + } LeaveCriticalSection(&pFilter->filter.csFilter); LeaveCriticalSection(&pFilter->csRenderLock); return hr; @@ -476,14 +479,6 @@ HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *iface) return hr; } -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *iface) -{ - TRACE("(%p)\n", iface); - BaseRendererImpl_ClearPendingSample(iface); - SetEvent(iface->flush_event); - return S_OK; -} - HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *iface) { TRACE("(%p)\n", iface); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index d0a0da1b10..cf209ae892 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -567,7 +567,6 @@ struct strmbase_renderer_ops HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out); }; -HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndOfStream(struct strmbase_renderer *filter); HRESULT WINAPI BaseRendererImpl_EndFlush(struct strmbase_renderer *filter);
participants (1)
-
Alexandre Julliard