[PATCH 3/5] strmbase: Remove no longer used allocator commit helpers.
Zebediah Figura
z.figura12 at gmail.com
Tue Nov 17 16:30:56 CST 2020
Signed-off-by: Zebediah Figura <z.figura12 at gmail.com>
---
dlls/strmbase/pin.c | 40 ----------------------------------------
include/wine/strmbase.h | 2 --
2 files changed, 42 deletions(-)
diff --git a/dlls/strmbase/pin.c b/dlls/strmbase/pin.c
index e5017c2ff98..406fba4165d 100644
--- a/dlls/strmbase/pin.c
+++ b/dlls/strmbase/pin.c
@@ -702,46 +702,6 @@ HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *This,
return hr;
}
-/* replaces OutputPin_CommitAllocator */
-HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *This)
-{
- HRESULT hr;
-
- TRACE("(%p)->()\n", This);
-
- EnterCriticalSection(&This->pin.filter->csFilter);
- {
- if (!This->pin.peer || !This->pMemInputPin)
- hr = VFW_E_NOT_CONNECTED;
- else
- hr = IMemAllocator_Commit(This->pAllocator);
- }
- LeaveCriticalSection(&This->pin.filter->csFilter);
-
- TRACE("--> %08x\n", hr);
- return hr;
-}
-
-/* replaces OutputPin_DecommitAllocator */
-HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *This)
-{
- HRESULT hr;
-
- TRACE("(%p)->()\n", This);
-
- EnterCriticalSection(&This->pin.filter->csFilter);
- {
- if (!This->pin.peer || !This->pMemInputPin)
- hr = VFW_E_NOT_CONNECTED;
- else
- hr = IMemAllocator_Decommit(This->pAllocator);
- }
- LeaveCriticalSection(&This->pin.filter->csFilter);
-
- TRACE("--> %08x\n", hr);
- return hr;
-}
-
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *This, IMemAllocator **pMemAlloc)
{
return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);
diff --git a/include/wine/strmbase.h b/include/wine/strmbase.h
index 24bb97702b5..39c556193ac 100644
--- a/include/wine/strmbase.h
+++ b/include/wine/strmbase.h
@@ -110,8 +110,6 @@ HRESULT strmbase_pin_get_media_type(struct strmbase_pin *pin, unsigned int index
HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(struct strmbase_source *pin,
IMediaSample **sample, REFERENCE_TIME *start, REFERENCE_TIME *stop, DWORD flags);
-HRESULT WINAPI BaseOutputPinImpl_Active(struct strmbase_source *pin);
-HRESULT WINAPI BaseOutputPinImpl_Inactive(struct strmbase_source *pin);
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(struct strmbase_source *pin, IMemAllocator **allocator);
HRESULT WINAPI BaseOutputPinImpl_DecideAllocator(struct strmbase_source *pin, IMemInputPin *peer, IMemAllocator **allocator);
HRESULT WINAPI BaseOutputPinImpl_AttemptConnection(struct strmbase_source *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
--
2.29.2
More information about the wine-devel
mailing list