Zebediah Figura : strmbase: Rename pfnOnStartStreaming to renderer_start_stream.
Alexandre Julliard
julliard at winehq.org
Wed Jul 3 17:11:53 CDT 2019
Module: wine
Branch: master
Commit: fa5c24e9330bf94fc9cf84ce604e2d289bb6dac4
URL: https://source.winehq.org/git/wine.git/?a=commit;h=fa5c24e9330bf94fc9cf84ce604e2d289bb6dac4
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Tue Jul 2 22:25:46 2019 -0500
strmbase: Rename pfnOnStartStreaming to renderer_start_stream.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/quartz/dsoundrender.c | 4 ++--
dlls/quartz/videorenderer.c | 4 ++--
dlls/quartz/vmr9.c | 4 ++--
dlls/strmbase/renderer.c | 4 ++--
include/wine/strmbase.h | 3 +--
5 files changed, 9 insertions(+), 10 deletions(-)
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index e44b455..0759d7f 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -434,7 +434,7 @@ static VOID WINAPI DSoundRender_OnStopStreaming(BaseRenderer * iface)
This->writepos = This->buf_size;
}
-static VOID WINAPI DSoundRender_OnStartStreaming(BaseRenderer * iface)
+static void dsound_render_start_stream(BaseRenderer *iface)
{
DSoundRenderImpl *This = impl_from_BaseRenderer(iface);
@@ -605,7 +605,7 @@ static const BaseRendererFuncTable BaseFuncTable =
{
.pfnCheckMediaType = DSoundRender_CheckMediaType,
.pfnDoRenderSample = DSoundRender_DoRenderSample,
- .pfnOnStartStreaming = DSoundRender_OnStartStreaming,
+ .renderer_start_stream = dsound_render_start_stream,
.pfnOnStopStreaming = DSoundRender_OnStopStreaming,
.pfnShouldDrawSampleNow = DSoundRender_ShouldDrawSampleNow,
.pfnPrepareReceive = DSoundRender_PrepareReceive,
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index decbe83..6f95fb6 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -417,7 +417,7 @@ static VOID WINAPI VideoRenderer_OnStopStreaming(BaseRenderer* iface)
RedrawWindow(This->baseControlWindow.baseWindow.hWnd, NULL, NULL, RDW_INVALIDATE|RDW_ERASE);
}
-static VOID WINAPI VideoRenderer_OnStartStreaming(BaseRenderer* iface)
+static void video_renderer_start_stream(BaseRenderer *iface)
{
VideoRendererImpl *This = impl_from_BaseRenderer(iface);
@@ -473,7 +473,7 @@ static const BaseRendererFuncTable BaseFuncTable =
{
.pfnCheckMediaType = VideoRenderer_CheckMediaType,
.pfnDoRenderSample = VideoRenderer_DoRenderSample,
- .pfnOnStartStreaming = VideoRenderer_OnStartStreaming,
+ .renderer_start_stream = video_renderer_start_stream,
.pfnOnStopStreaming = VideoRenderer_OnStopStreaming,
.pfnShouldDrawSampleNow = VideoRenderer_ShouldDrawSampleNow,
.pfnEndFlush = VideoRenderer_EndFlush,
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 6761fbf..e40ae6e 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -429,7 +429,7 @@ static HRESULT VMR9_maybe_init(struct quartz_vmr *This, BOOL force)
return hr;
}
-static VOID WINAPI VMR9_OnStartStreaming(BaseRenderer* iface)
+static void vmr_start_stream(BaseRenderer *iface)
{
struct quartz_vmr *This = impl_from_IBaseFilter(&iface->filter.IBaseFilter_iface);
@@ -562,7 +562,7 @@ static const BaseRendererFuncTable BaseFuncTable =
{
.pfnCheckMediaType = VMR9_CheckMediaType,
.pfnDoRenderSample = VMR9_DoRenderSample,
- .pfnOnStartStreaming = VMR9_OnStartStreaming,
+ .renderer_start_stream = vmr_start_stream,
.pfnOnStopStreaming = VMR9_OnStopStreaming,
.pfnShouldDrawSampleNow = VMR9_ShouldDrawSampleNow,
.pfnCompleteConnect = VMR9_CompleteConnect,
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index 41a0e28..e6fb024 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -441,8 +441,8 @@ HRESULT WINAPI BaseRendererImpl_Run(IBaseFilter * iface, REFERENCE_TIME tStart)
if (SUCCEEDED(hr))
{
QualityControlRender_Start(This->qcimpl, This->filter.rtStreamStart);
- if (This->pFuncsTable->pfnOnStartStreaming)
- This->pFuncsTable->pfnOnStartStreaming(This);
+ if (This->pFuncsTable->renderer_start_stream)
+ This->pFuncsTable->renderer_start_stream(This);
if (This->filter.state == State_Stopped)
BaseRendererImpl_ClearPendingSample(This);
This->filter.state = State_Running;
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index f7f8741..86aee4b 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_OnStartStreaming)(BaseRenderer *This);
typedef VOID (WINAPI *BaseRenderer_OnStopStreaming)(BaseRenderer *This);
typedef VOID (WINAPI *BaseRenderer_OnWaitEnd)(BaseRenderer *This);
typedef VOID (WINAPI *BaseRenderer_OnWaitStart)(BaseRenderer *This);
@@ -578,7 +577,7 @@ typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (BaseRenderer *This, IPin
typedef struct BaseRendererFuncTable {
BaseRenderer_CheckMediaType pfnCheckMediaType;
BaseRenderer_DoRenderSample pfnDoRenderSample;
- BaseRenderer_OnStartStreaming pfnOnStartStreaming;
+ void (*renderer_start_stream)(BaseRenderer *iface);
BaseRenderer_OnStopStreaming pfnOnStopStreaming;
BaseRenderer_ShouldDrawSampleNow pfnShouldDrawSampleNow;
BaseRenderer_PrepareReceive pfnPrepareReceive;
More information about the wine-cvs
mailing list