Zebediah Figura : strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.
Module: wine Branch: master Commit: 444f9b7ba2fda3f2c32cd4674eb78186505352d7 URL: https://source.winehq.org/git/wine.git/?a=commit;h=444f9b7ba2fda3f2c32cd4674... Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue Jul 2 22:25:47 2019 -0500 strmbase: Rename pfnOnStopStreaming to renderer_stop_stream. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/quartz/dsoundrender.c | 4 ++-- dlls/quartz/videorenderer.c | 4 ++-- dlls/quartz/vmr9.c | 4 ++-- dlls/strmbase/renderer.c | 8 ++++---- include/wine/strmbase.h | 3 +-- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c index 0759d7f..930b7a9 100644 --- a/dlls/quartz/dsoundrender.c +++ b/dlls/quartz/dsoundrender.c @@ -424,7 +424,7 @@ static HRESULT WINAPI DSoundRender_CheckMediaType(BaseRenderer *iface, const AM_ return S_OK; } -static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface) +static void dsound_render_stop_stream(BaseRenderer *iface) { DSoundRenderImpl *This = impl_from_BaseRenderer(iface); @@ -606,7 +606,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = DSoundRender_CheckMediaType, .pfnDoRenderSample = DSoundRender_DoRenderSample, .renderer_start_stream = dsound_render_start_stream, - .pfnOnStopStreaming = DSoundRender_OnStopStreaming, + .renderer_stop_stream = dsound_render_stop_stream, .pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow, .pfnPrepareReceive = DSoundRender_PrepareReceive, .pfnCompleteConnect = DSoundRender_CompleteConnect, diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c index 6f95fb6..37c30ba 100644 --- a/dlls/quartz/videorenderer.c +++ b/dlls/quartz/videorenderer.c @@ -405,7 +405,7 @@ static HRESULT video_renderer_query_interface(BaseRenderer *iface, REFIID iid, v return S_OK; } -static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface) +static void video_renderer_stop_stream(BaseRenderer *iface) { VideoRendererImpl *This = impl_from_BaseRenderer(iface); @@ -474,7 +474,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VideoRenderer_CheckMediaType, .pfnDoRenderSample = VideoRenderer_DoRenderSample, .renderer_start_stream = video_renderer_start_stream, - .pfnOnStopStreaming = VideoRenderer_OnStopStreaming, + .renderer_stop_stream = video_renderer_stop_stream, .pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow, .pfnEndFlush = VideoRenderer_EndFlush, .renderer_destroy = video_renderer_destroy, diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c index e40ae6e..f210d2c 100644 --- a/dlls/quartz/vmr9.c +++ b/dlls/quartz/vmr9.c @@ -447,7 +447,7 @@ static void vmr_start_stream(BaseRenderer *iface) GetClientRect(This->baseControlWindow.baseWindow.hWnd, &This->target_rect); } -static VOID WINAPI VMR9_OnStopStreaming(BaseRenderer* iface) +static void vmr_stop_stream(BaseRenderer *iface) { struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface); @@ -563,7 +563,7 @@ static const BaseRendererFuncTable BaseFuncTable = .pfnCheckMediaType = VMR9_CheckMediaType, .pfnDoRenderSample = VMR9_DoRenderSample, .renderer_start_stream = vmr_start_stream, - .pfnOnStopStreaming = VMR9_OnStopStreaming, + .renderer_stop_stream = vmr_stop_stream, .pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow, .pfnCompleteConnect = VMR9_CompleteConnect, .pfnBreakConnect = VMR9_BreakConnect, diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c index e6fb024..e823e6b 100644 --- a/dlls/strmbase/renderer.c +++ b/dlls/strmbase/renderer.c @@ -399,8 +399,8 @@ HRESULT WINAPI BaseRendererImpl_Stop(IBaseFilter * iface) EnterCriticalSection(&This->csRenderLock); { RendererPosPassThru_ResetMediaTime(This->pPosition); - if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); This->filter.state = State_Stopped; SetEvent(This->state_event); SetEvent(This->flush_event); @@ -469,8 +469,8 @@ HRESULT WINAPI BaseRendererImpl_Pause(IBaseFilter * iface) ResetEvent(This->state_event); This->sink.end_of_stream = FALSE; } - else if (This->pFuncsTable->pfnOnStopStreaming) - This->pFuncsTable->pfnOnStopStreaming(This); + else if (This->pFuncsTable->renderer_stop_stream) + This->pFuncsTable->renderer_stop_stream(This); if (This->filter.state == State_Stopped) BaseRendererImpl_ClearPendingSample(This); diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h index 86aee4b..0c2c9db 100644 --- a/include/wine/strmbase.h +++ b/include/wine/strmbase.h @@ -562,7 +562,6 @@ typedef HRESULT (WINAPI *BaseRenderer_DoRenderSample)(BaseRenderer *This, IMedia typedef VOID (WINAPI *BaseRenderer_OnReceiveFirstSample)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderEnd)(BaseRenderer *This, IMediaSample *pMediaSample); typedef VOID (WINAPI *BaseRenderer_OnRenderStart)(BaseRenderer *This, IMediaSample *pMediaSample); -typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This); typedef VOID (WINAPI *BaseRenderer_PrepareRender)(BaseRenderer *This); @@ -578,7 +577,7 @@ typedef struct BaseRendererFuncTable { BaseRenderer_CheckMediaType pfnCheckMediaType; BaseRenderer_DoRenderSample pfnDoRenderSample; void (*renderer_start_stream)(BaseRenderer *iface); - BaseRenderer_OnStopStreaming pfnOnStopStreaming; + void (*renderer_stop_stream)(BaseRenderer *iface); BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow; BaseRenderer_PrepareReceive pfnPrepareReceive; BaseRenderer_CompleteConnect pfnCompleteConnect;
participants (1)
-
Alexandre Julliard