Zebediah Figura : strmbase: Move strmbase_renderer_init() to avoid forward declarations.
Alexandre Julliard
julliard at winehq.org
Sun Oct 27 15:06:16 CDT 2019
Module: wine
Branch: master
Commit: 1454a661e59f5845006af77382264aaf3d6aeebb
URL: https://source.winehq.org/git/wine.git/?a=commit;h=1454a661e59f5845006af77382264aaf3d6aeebb
Author: Zebediah Figura <z.figura12 at gmail.com>
Date: Wed Oct 23 20:04:22 2019 -0500
strmbase: Move strmbase_renderer_init() to avoid forward declarations.
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>
---
dlls/strmbase/renderer.c | 70 +++++++++++++++++++++++-------------------------
1 file changed, 34 insertions(+), 36 deletions(-)
diff --git a/dlls/strmbase/renderer.c b/dlls/strmbase/renderer.c
index 86c4f7d1d7..81afc7c8d7 100644
--- a/dlls/strmbase/renderer.c
+++ b/dlls/strmbase/renderer.c
@@ -250,42 +250,6 @@ static const BaseInputPinFuncTable input_BaseInputFuncTable =
.pfnReceive = BaseRenderer_Receive,
};
-static const IBaseFilterVtbl strmbase_renderer_vtbl;
-
-HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, IUnknown *outer,
- const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *pBaseFuncsTable)
-{
- HRESULT hr;
-
- memset(filter, 0, sizeof(*filter));
- strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops);
-
- filter->pFuncsTable = pBaseFuncsTable;
-
- strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter,
- sink_name, &input_BaseInputFuncTable, NULL);
-
- hr = CreatePosPassThru(outer ? outer : (IUnknown *)&filter->filter.IBaseFilter_iface, TRUE,
- &filter->sink.pin.IPin_iface, &filter->pPosition);
- if (FAILED(hr))
- {
- strmbase_sink_cleanup(&filter->sink);
- strmbase_filter_cleanup(&filter->filter);
- return hr;
- }
-
- InitializeCriticalSection(&filter->csRenderLock);
- filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock");
- filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL);
- filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL);
- filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL);
-
- QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl);
- filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl;
-
- return S_OK;
-}
-
void strmbase_renderer_cleanup(BaseRenderer *filter)
{
if (filter->sink.pin.peer)
@@ -595,3 +559,37 @@ HRESULT WINAPI BaseRendererImpl_ClearPendingSample(BaseRenderer *iface)
}
return S_OK;
}
+
+HRESULT WINAPI strmbase_renderer_init(BaseRenderer *filter, IUnknown *outer,
+ const CLSID *clsid, const WCHAR *sink_name, const BaseRendererFuncTable *func_table)
+{
+ HRESULT hr;
+
+ memset(filter, 0, sizeof(*filter));
+ strmbase_filter_init(&filter->filter, &strmbase_renderer_vtbl, outer, clsid, &filter_ops);
+
+ filter->pFuncsTable = func_table;
+
+ strmbase_sink_init(&filter->sink, &BaseRenderer_InputPin_Vtbl, &filter->filter,
+ sink_name, &input_BaseInputFuncTable, NULL);
+
+ hr = CreatePosPassThru(outer ? outer : (IUnknown *)&filter->filter.IBaseFilter_iface,
+ TRUE, &filter->sink.pin.IPin_iface, &filter->pPosition);
+ if (FAILED(hr))
+ {
+ strmbase_sink_cleanup(&filter->sink);
+ strmbase_filter_cleanup(&filter->filter);
+ return hr;
+ }
+
+ InitializeCriticalSection(&filter->csRenderLock);
+ filter->csRenderLock.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__": BaseRenderer.csRenderLock");
+ filter->state_event = CreateEventW(NULL, TRUE, TRUE, NULL);
+ filter->advise_event = CreateEventW(NULL, FALSE, FALSE, NULL);
+ filter->flush_event = CreateEventW(NULL, TRUE, TRUE, NULL);
+
+ QualityControlImpl_Create(&filter->sink.pin.IPin_iface, &filter->filter.IBaseFilter_iface, &filter->qcimpl);
+ filter->qcimpl->IQualityControl_iface.lpVtbl = &Renderer_QualityControl_Vtbl;
+
+ return S_OK;
+}
More information about the wine-cvs
mailing list