Zebediah Figura : strmbase: Get rid of the BaseRendererFuncTable typedef.
Alexandre Julliard
julliard at winehq.org
Sun Oct 27 15:06:16 CDT 2019
Module: wine
Branch: master
Commit: 0f8dbcdf803e82cb2eeeb083ea32046eda0ae065
URL: https://source.winehq.org/git/wine.git/?a=commit;h=0f8dbcdf803e82cb2eeeb083ea32046eda0ae065
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Oct 23 20:04:24 2019 -0500
strmbase: Get rid of the BaseRendererFuncTable typedef.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/evr/evr.c | 2 +-
dlls/qedit/nullrenderer.c | 4 ++--
dlls/quartz/dsoundrender.c | 4 ++--
dlls/quartz/videorenderer.c | 4 ++--
dlls/quartz/vmr9.c | 4 ++--
dlls/strmbase/renderer.c | 4 ++--
include/wine/strmbase.h | 9 +++++----
7 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/dlls/evr/evr.c b/dlls/evr/evr.c
index b1721db027..acaa9927c1 100644
--- a/dlls/evr/evr.c
+++ b/dlls/evr/evr.c
@@ -61,7 +61,7 @@ static HRESULT WINAPI evr_CheckMediaType(struct strmbase_renderer *iface, const
return E_NOTIMPL;
}
-static const BaseRendererFuncTable renderer_ops =
+static const struct strmbase_renderer_ops renderer_ops =
{
.pfnCheckMediaType = evr_CheckMediaType,
.pfnDoRenderSample = evr_DoRenderSample,
diff --git a/dlls/qedit/nullrenderer.c b/dlls/qedit/nullrenderer.c
index b9bc3fec25..b3267d1ba1 100644
--- a/dlls/qedit/nullrenderer.c
+++ b/dlls/qedit/nullrenderer.c
@@ -55,7 +55,7 @@ static void null_renderer_destroy(struct strmbase_renderer *iface)
CoTaskMemFree(filter);
}
-static const BaseRendererFuncTable RendererFuncTable =
+static const struct strmbase_renderer_ops renderer_ops =
{
.pfnCheckMediaType = NullRenderer_CheckMediaType,
.pfnDoRenderSample = NullRenderer_DoRenderSample,
@@ -74,7 +74,7 @@ HRESULT NullRenderer_create(IUnknown *outer, void **out)
pNullRenderer = CoTaskMemAlloc(sizeof(NullRendererImpl));
hr = strmbase_renderer_init(&pNullRenderer->renderer, outer,
- &CLSID_NullRenderer, sink_name, &RendererFuncTable);
+ &CLSID_NullRenderer, sink_name, &renderer_ops);
if (FAILED(hr))
CoTaskMemFree(pNullRenderer);
diff --git a/dlls/quartz/dsoundrender.c b/dlls/quartz/dsoundrender.c
index 54b4c59903..ed257c373f 100644
--- a/dlls/quartz/dsoundrender.c
+++ b/dlls/quartz/dsoundrender.c
@@ -580,7 +580,7 @@ static HRESULT dsound_render_query_interface(struct strmbase_renderer *iface, RE
return S_OK;
}
-static const BaseRendererFuncTable BaseFuncTable =
+static const struct strmbase_renderer_ops renderer_ops =
{
.pfnCheckMediaType = DSoundRender_CheckMediaType,
.pfnDoRenderSample = DSoundRender_DoRenderSample,
@@ -611,7 +611,7 @@ HRESULT DSoundRender_create(IUnknown *outer, void **out)
ZeroMemory(pDSoundRender, sizeof(DSoundRenderImpl));
hr = strmbase_renderer_init(&pDSoundRender->renderer,
- outer, &CLSID_DSoundRender, sink_name, &BaseFuncTable);
+ outer, &CLSID_DSoundRender, sink_name, &renderer_ops);
pDSoundRender->IBasicAudio_iface.lpVtbl = &IBasicAudio_Vtbl;
pDSoundRender->IReferenceClock_iface.lpVtbl = &IReferenceClock_Vtbl;
diff --git a/dlls/quartz/videorenderer.c b/dlls/quartz/videorenderer.c
index 0752a586bd..b21cc281b9 100644
--- a/dlls/quartz/videorenderer.c
+++ b/dlls/quartz/videorenderer.c
@@ -367,7 +367,7 @@ static BOOL WINAPI VideoRenderer_OnSize(BaseWindow *iface, LONG Width, LONG Heig
return TRUE;
}
-static const BaseRendererFuncTable BaseFuncTable =
+static const struct strmbase_renderer_ops renderer_ops =
{
.pfnCheckMediaType = VideoRenderer_CheckMediaType,
.pfnDoRenderSample = VideoRenderer_DoRenderSample,
@@ -760,7 +760,7 @@ HRESULT VideoRenderer_create(IUnknown *outer, void **out)
pVideoRenderer->IOverlay_iface.lpVtbl = &overlay_vtbl;
hr = strmbase_renderer_init(&pVideoRenderer->renderer, outer,
- &CLSID_VideoRenderer, sink_name, &BaseFuncTable);
+ &CLSID_VideoRenderer, sink_name, &renderer_ops);
if (FAILED(hr))
goto fail;
diff --git a/dlls/quartz/vmr9.c b/dlls/quartz/vmr9.c
index 6a039db99a..1a4f85c87c 100644
--- a/dlls/quartz/vmr9.c
+++ b/dlls/quartz/vmr9.c
@@ -555,7 +555,7 @@ static HRESULT vmr_pin_query_interface(struct strmbase_renderer *iface, REFIID i
return S_OK;
}
-static const BaseRendererFuncTable BaseFuncTable =
+static const struct strmbase_renderer_ops renderer_ops =
{
.pfnCheckMediaType = VMR9_CheckMediaType,
.pfnDoRenderSample = VMR9_DoRenderSample,
@@ -2229,7 +2229,7 @@ static HRESULT vmr_create(IUnknown *outer, void **out, const CLSID *clsid)
pVMR->IVMRWindowlessControl9_iface.lpVtbl = &VMR9_WindowlessControl_Vtbl;
pVMR->IOverlay_iface.lpVtbl = &overlay_vtbl;
- hr = strmbase_renderer_init(&pVMR->renderer, outer, clsid, sink_name, &BaseFuncTable);
+ hr = strmbase_renderer_init(&pVMR->renderer, outer, clsid, sink_name, &renderer_ops);
if (FAILED(hr))
goto fail;
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index 8ff687e453..c75452aea6 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -561,14 +561,14 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *ifa
}
HRESULT WINAPI strmbase_renderer_init(struct strmbase_renderer *filter, IUnknown *outer,
- const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table)
+ const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops)
{
HRESULT hr;
memset(filter, 0, sizeof(*filter));
strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops);
- filter->pFuncsTable = func_table;
+ filter->pFuncsTable = ops;
strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter,
sink_name, &input_BaseInputFuncTable, NULL);
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 3c90223955..791901077d 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -527,7 +527,7 @@ struct strmbase_renderer
IQualityControl *pQSink;
struct QualityControlImpl *qcimpl;
- const struct BaseRendererFuncTable *pFuncsTable;
+ const struct strmbase_renderer_ops *pFuncsTable;
};
typedef HRESULT (WINAPI *BaseRenderer_CheckMediaType)(struct strmbase_renderer *iface, const AM_MEDIA_TYPE *mt);
@@ -541,7 +541,8 @@ typedef HRESULT (WINAPI *BaseRenderer_EndFlush) (struct strmbase_renderer *iface
typedef HRESULT (WINAPI *BaseRenderer_BreakConnect) (struct strmbase_renderer *iface);
typedef HRESULT (WINAPI *BaseRenderer_CompleteConnect) (struct strmbase_renderer *iface, IPin *peer);
-typedef struct BaseRendererFuncTable {
+struct strmbase_renderer_ops
+{
BaseRenderer_CheckMediaType pfnCheckMediaType;
BaseRenderer_DoRenderSample pfnDoRenderSample;
void (*renderer_init_stream)(struct strmbase_renderer *iface);
@@ -556,7 +557,7 @@ typedef struct BaseRendererFuncTable {
void (*renderer_destroy)(struct strmbase_renderer *iface);
HRESULT (*renderer_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);
HRESULT (*renderer_pin_query_interface)(struct strmbase_renderer *iface, REFIID iid, void **out);
-} BaseRendererFuncTable;
+};
HRESULT WINAPI BaseRendererImpl_BeginFlush(struct strmbase_renderer *filter);
HRESULT WINAPI BaseRendererImpl_ClearPendingSample(struct strmbase_renderer *filter);
@@ -565,7 +566,7 @@ 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,
- const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table);
+ const CLSID *clsid, const WCHAR *sink_name, const struct strmbase_renderer_ops *ops);
void strmbase_renderer_cleanup(struct strmbase_renderer *filter);
/* Dll Functions */
More information about the wine-cvs
mailing list