Commit 43444f40 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

strmbase: Rename BaseFilter_Destroy() to strmbase_filter_cleanup().

parent 6a610a32
...@@ -177,7 +177,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface) ...@@ -177,7 +177,7 @@ static ULONG WINAPI unknown_inner_Release(IUnknown *iface)
IPin_Release(conn); IPin_Release(conn);
} }
IPin_Release(This->pOutputPin); IPin_Release(This->pOutputPin);
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This); CoTaskMemFree(This);
ObjectRefCount(FALSE); ObjectRefCount(FALSE);
} }
......
...@@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface) ...@@ -493,7 +493,7 @@ static ULONG WINAPI AsyncReader_Release(IBaseFilter * iface)
CoTaskMemFree(This->pszFileName); CoTaskMemFree(This->pszFileName);
if (This->pmt) if (This->pmt)
DeleteMediaType(This->pmt); DeleteMediaType(This->pmt);
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This); CoTaskMemFree(This);
return 0; return 0;
} }
......
...@@ -193,7 +193,7 @@ void Parser_Destroy(ParserImpl *This) ...@@ -193,7 +193,7 @@ void Parser_Destroy(ParserImpl *This)
} }
CoTaskMemFree(This->ppPins); CoTaskMemFree(This->ppPins);
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
TRACE("Destroying parser\n"); TRACE("Destroying parser\n");
CoTaskMemFree(This); CoTaskMemFree(This);
......
...@@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface) ...@@ -62,7 +62,7 @@ ULONG WINAPI BaseFilterImpl_Release(IBaseFilter * iface)
TRACE("(%p)->() Release from %d\n", This, refCount + 1); TRACE("(%p)->() Release from %d\n", This, refCount + 1);
if (!refCount) if (!refCount)
BaseFilter_Destroy(This); strmbase_filter_cleanup(This);
return refCount; return refCount;
} }
...@@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID ...@@ -227,7 +227,7 @@ void BaseFilter_Init(BaseFilter *This, const IBaseFilterVtbl *Vtbl, const CLSID
This->pFuncsTable = pBaseFuncsTable; This->pFuncsTable = pBaseFuncsTable;
} }
HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This) HRESULT WINAPI strmbase_filter_cleanup(BaseFilter * This)
{ {
if (This->pClock) if (This->pClock)
IReferenceClock_Release(This->pClock); IReferenceClock_Release(This->pClock);
......
...@@ -298,7 +298,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter) ...@@ -298,7 +298,7 @@ void strmbase_renderer_cleanup(BaseRenderer *filter)
CloseHandle(filter->ThreadSignal); CloseHandle(filter->ThreadSignal);
CloseHandle(filter->RenderEvent); CloseHandle(filter->RenderEvent);
QualityControlImpl_Destroy(filter->qcimpl); QualityControlImpl_Destroy(filter->qcimpl);
BaseFilter_Destroy(&filter->filter); strmbase_filter_cleanup(&filter->filter);
} }
HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample) HRESULT WINAPI BaseRendererImpl_Receive(BaseRenderer *This, IMediaSample * pSample)
......
...@@ -194,7 +194,7 @@ static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface) ...@@ -194,7 +194,7 @@ static ULONG WINAPI TransformFilterImpl_Release(IBaseFilter * iface)
FreeMediaType(&This->pmt); FreeMediaType(&This->pmt);
QualityControlImpl_Destroy(This->qcimpl); QualityControlImpl_Destroy(This->qcimpl);
IUnknown_Release(This->seekthru_unk); IUnknown_Release(This->seekthru_unk);
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This); CoTaskMemFree(This);
} }
return refCount; return refCount;
......
...@@ -1302,7 +1302,7 @@ static void GST_Destroy(GSTImpl *This) ...@@ -1302,7 +1302,7 @@ static void GST_Destroy(GSTImpl *This)
gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL); gst_bus_set_sync_handler(This->bus, NULL, NULL, NULL);
gst_object_unref(This->bus); gst_object_unref(This->bus);
} }
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This); CoTaskMemFree(This);
} }
......
...@@ -337,7 +337,7 @@ static void QT_Destroy(QTSplitter *This) ...@@ -337,7 +337,7 @@ static void QT_Destroy(QTSplitter *This)
This->csReceive.DebugInfo->Spare[0] = 0; This->csReceive.DebugInfo->Spare[0] = 0;
DeleteCriticalSection(&This->csReceive); DeleteCriticalSection(&This->csReceive);
BaseFilter_Destroy(&This->filter); strmbase_filter_cleanup(&This->filter);
CoTaskMemFree(This); CoTaskMemFree(This);
} }
......
...@@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This); ...@@ -192,7 +192,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(BaseFilter* This);
void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl, void BaseFilter_Init(BaseFilter *filter, const IBaseFilterVtbl *vtbl,
const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table); const CLSID *clsid, DWORD_PTR debug_info, const BaseFilterFuncTable *func_table);
HRESULT WINAPI BaseFilter_Destroy(BaseFilter * This); HRESULT WINAPI strmbase_filter_cleanup(BaseFilter *filter);
/* Enums */ /* Enums */
HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum); HRESULT WINAPI EnumMediaTypes_Construct(BasePin *iface, BasePin_GetMediaType enumFunc, BasePin_GetMediaTypeVersion versionFunc, IEnumMediaTypes ** ppEnum);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment