[PATCH 5/5] strmbase: Rename pfnOnStopStreaming to renderer_stop_stream.

Zebediah Figura z.figura12 at gmail.com
Tue Jul 2 22:25:47 CDT 2019


Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
 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 a4e374b5897..8db7263d1e1 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 970e9f411f1..00abfdf6370 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 6c0d6a5ffc7..55fb171a176 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 6a6119afdd1..0972f499c5a 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 942f7806294..b1483fc26c9 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;
-- 
2.22.0




More information about the wine-devel mailing list