strmbase: Get rid of the "pfnBreakConnect" field from BaseOutputPinFuncTable.
Signed-off-by: Zebediah Figura <z.figura12@gmail.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
parent
7c46e56ce2
commit
df05902b96
|
@ -657,12 +657,6 @@ static HRESULT WINAPI AVICompressorOut_DecideAllocator(BaseOutputPin *base,
|
|||
return BaseOutputPinImpl_DecideAllocator(base, pPin, pAlloc);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base)
|
||||
{
|
||||
FIXME("(%p)\n", base);
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
|
||||
{
|
||||
NULL,
|
||||
|
@ -671,7 +665,6 @@ static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
AVICompressorOut_DecideBufferSize,
|
||||
AVICompressorOut_DecideAllocator,
|
||||
AVICompressorOut_BreakConnect
|
||||
};
|
||||
|
||||
IUnknown* WINAPI QCAP_createAVICompressor(IUnknown *outer, HRESULT *phr)
|
||||
|
|
|
@ -1292,12 +1292,6 @@ static HRESULT WINAPI AviMuxOut_DecideAllocator(BaseOutputPin *base,
|
|||
return IMemInputPin_NotifyAllocator(pPin, *pAlloc, TRUE);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base)
|
||||
{
|
||||
FIXME("(%p)\n", base);
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
|
||||
{
|
||||
AviMuxOut_CheckMediaType,
|
||||
|
@ -1306,7 +1300,6 @@ static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
|
|||
AviMuxOut_AttemptConnection,
|
||||
NULL,
|
||||
AviMuxOut_DecideAllocator,
|
||||
AviMuxOut_BreakConnect
|
||||
};
|
||||
|
||||
static inline AviMux* impl_from_out_IPin(IPin *iface)
|
||||
|
|
|
@ -498,13 +498,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_DecideAllocator(BaseOutputPin *base,
|
|||
return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base)
|
||||
{
|
||||
SmartTeeFilter *This = impl_from_BasePin(&base->pin);
|
||||
FIXME("(%p): stub\n", This);
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
|
||||
{
|
||||
SmartTeeFilterCapture_CheckMediaType,
|
||||
|
@ -513,7 +506,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
NULL,
|
||||
SmartTeeFilterCapture_DecideAllocator,
|
||||
SmartTeeFilterCapture_BreakConnect
|
||||
};
|
||||
|
||||
static ULONG WINAPI SmartTeeFilterPreview_AddRef(IPin *iface)
|
||||
|
@ -589,13 +581,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_DecideAllocator(BaseOutputPin *base,
|
|||
return IMemInputPin_NotifyAllocator(pPin, This->input->pAllocator, TRUE);
|
||||
}
|
||||
|
||||
static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base)
|
||||
{
|
||||
SmartTeeFilter *This = impl_from_BasePin(&base->pin);
|
||||
FIXME("(%p): stub\n", This);
|
||||
return E_NOTIMPL;
|
||||
}
|
||||
|
||||
static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
|
||||
{
|
||||
SmartTeeFilterPreview_CheckMediaType,
|
||||
|
@ -604,7 +589,6 @@ static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
NULL,
|
||||
SmartTeeFilterPreview_DecideAllocator,
|
||||
SmartTeeFilterPreview_BreakConnect
|
||||
};
|
||||
IUnknown* WINAPI QCAP_createSmartTeeFilter(IUnknown *outer, HRESULT *phr)
|
||||
{
|
||||
|
|
|
@ -707,7 +707,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
VfwPin_DecideBufferSize,
|
||||
BaseOutputPinImpl_DecideAllocator,
|
||||
BaseOutputPinImpl_BreakConnect
|
||||
};
|
||||
|
||||
static HRESULT
|
||||
|
|
|
@ -914,7 +914,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
|
|||
FileAsyncReaderPin_AttemptConnection,
|
||||
FileAsyncReaderPin_DecideBufferSize,
|
||||
BaseOutputPinImpl_DecideAllocator,
|
||||
BaseOutputPinImpl_BreakConnect
|
||||
};
|
||||
|
||||
static HRESULT FileAsyncReader_Construct(HANDLE hFile, IBaseFilter * pBaseFilter, LPCRITICAL_SECTION pCritSec, IPin ** ppPin)
|
||||
|
|
|
@ -428,7 +428,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
Parser_OutputPin_DecideBufferSize,
|
||||
Parser_OutputPin_DecideAllocator,
|
||||
NULL,
|
||||
};
|
||||
|
||||
HRESULT Parser_AddPin(ParserImpl * This, const PIN_INFO * piOutput, ALLOCATOR_PROPERTIES * props, const AM_MEDIA_TYPE * amt)
|
||||
|
|
|
@ -639,31 +639,6 @@ HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin *This)
|
|||
return hr;
|
||||
}
|
||||
|
||||
/* replaces OutputPin_DeliverDisconnect */
|
||||
HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin *This)
|
||||
{
|
||||
HRESULT hr;
|
||||
|
||||
TRACE("(%p)->()\n", This);
|
||||
|
||||
EnterCriticalSection(This->pin.pCritSec);
|
||||
{
|
||||
if (!This->pin.pConnectedTo || !This->pMemInputPin)
|
||||
hr = VFW_E_NOT_CONNECTED;
|
||||
else
|
||||
{
|
||||
hr = IMemAllocator_Decommit(This->pAllocator);
|
||||
|
||||
if (SUCCEEDED(hr))
|
||||
hr = IPin_Disconnect(This->pin.pConnectedTo);
|
||||
}
|
||||
IPin_Disconnect(&This->pin.IPin_iface);
|
||||
}
|
||||
LeaveCriticalSection(This->pin.pCritSec);
|
||||
|
||||
return hr;
|
||||
}
|
||||
|
||||
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc)
|
||||
{
|
||||
return CoCreateInstance(&CLSID_MemoryAllocator, NULL, CLSCTX_INPROC_SERVER, &IID_IMemAllocator, (LPVOID*)pMemAlloc);
|
||||
|
|
|
@ -165,7 +165,6 @@ static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
TransformFilter_Output_DecideBufferSize,
|
||||
BaseOutputPinImpl_DecideAllocator,
|
||||
BaseOutputPinImpl_BreakConnect
|
||||
};
|
||||
|
||||
static HRESULT TransformFilter_Init(const IBaseFilterVtbl *pVtbl, const CLSID* pClsid, const TransformFilterFuncTable* pFuncsTable, TransformFilter* pTransformFilter)
|
||||
|
|
|
@ -1879,7 +1879,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
GSTOutPin_DecideBufferSize,
|
||||
GSTOutPin_DecideAllocator,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static HRESULT GST_AddPin(GSTImpl *This, const PIN_INFO *piOutput, const AM_MEDIA_TYPE *amt)
|
||||
|
|
|
@ -1520,7 +1520,6 @@ static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
|
|||
BaseOutputPinImpl_AttemptConnection,
|
||||
QTOutPin_DecideBufferSize,
|
||||
QTOutPin_DecideAllocator,
|
||||
NULL,
|
||||
};
|
||||
|
||||
static const OutputQueueFuncTable output_OutputQueueFuncTable = {
|
||||
|
|
|
@ -67,7 +67,6 @@ typedef struct BaseOutputPin
|
|||
typedef HRESULT (WINAPI *BaseOutputPin_AttemptConnection)(BaseOutputPin *pin, IPin *peer, const AM_MEDIA_TYPE *mt);
|
||||
typedef HRESULT (WINAPI *BaseOutputPin_DecideBufferSize)(BaseOutputPin *This, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest);
|
||||
typedef HRESULT (WINAPI *BaseOutputPin_DecideAllocator)(BaseOutputPin *This, IMemInputPin *pPin, IMemAllocator **pAlloc);
|
||||
typedef HRESULT (WINAPI *BaseOutputPin_BreakConnect)(BaseOutputPin * This);
|
||||
|
||||
typedef struct BaseOutputPinFuncTable {
|
||||
BasePinFuncTable base;
|
||||
|
@ -78,7 +77,6 @@ typedef struct BaseOutputPinFuncTable {
|
|||
BaseOutputPin_DecideBufferSize pfnDecideBufferSize;
|
||||
/* Required for BaseOutputPinImpl_AttemptConnection */
|
||||
BaseOutputPin_DecideAllocator pfnDecideAllocator;
|
||||
BaseOutputPin_BreakConnect pfnBreakConnect;
|
||||
} BaseOutputPinFuncTable;
|
||||
|
||||
typedef struct BaseInputPin
|
||||
|
@ -129,7 +127,6 @@ HRESULT WINAPI BaseOutputPinImpl_EndFlush(IPin * iface);
|
|||
|
||||
HRESULT WINAPI BaseOutputPinImpl_GetDeliveryBuffer(BaseOutputPin * This, IMediaSample ** ppSample, REFERENCE_TIME * tStart, REFERENCE_TIME * tStop, DWORD dwFlags);
|
||||
HRESULT WINAPI BaseOutputPinImpl_Deliver(BaseOutputPin * This, IMediaSample * pSample);
|
||||
HRESULT WINAPI BaseOutputPinImpl_BreakConnect(BaseOutputPin * This);
|
||||
HRESULT WINAPI BaseOutputPinImpl_Active(BaseOutputPin * This);
|
||||
HRESULT WINAPI BaseOutputPinImpl_Inactive(BaseOutputPin * This);
|
||||
HRESULT WINAPI BaseOutputPinImpl_InitAllocator(BaseOutputPin *This, IMemAllocator **pMemAlloc);
|
||||
|
|
Loading…
Reference in New Issue