Skip to content

W
wine-winehq
Commit 9be79954 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard
Browse files
Options

strmbase: Get rid of the "pfnGetMediaTypeVersion" callback.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 7e6ab5e5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 79 deletions
dlls/amstream/mediastream.c
View file @ 9be79954
......@@ -532,11 +532,6 @@ static HRESULT WINAPI DirectDrawMediaStreamInputPin_CheckMediaType(BasePin *base
return S_FALSE;
}
static LONG WINAPI DirectDrawMediaStreamInputPin_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI DirectDrawMediaStreamInputPin_GetMediaType(BasePin *base, int index, AM_MEDIA_TYPE *media_type)
{
DirectDrawMediaStreamInputPin *This = impl_from_DirectDrawMediaStreamInputPin_IPin(&base->IPin_iface);
......@@ -591,7 +586,6 @@ static const BaseInputPinFuncTable DirectDrawMediaStreamInputPin_FuncTable =
{
{
DirectDrawMediaStreamInputPin_CheckMediaType,
DirectDrawMediaStreamInputPin_GetMediaTypeVersion,
DirectDrawMediaStreamInputPin_GetMediaType,
},
DirectDrawMediaStreamInputPin_Receive,
......@@ -1098,11 +1092,6 @@ static HRESULT WINAPI AudioMediaStreamInputPin_CheckMediaType(BasePin *base, con
return S_OK;
}
static LONG WINAPI AudioMediaStreamInputPin_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI AudioMediaStreamInputPin_GetMediaType(BasePin *base, int index, AM_MEDIA_TYPE *media_type)
{
AudioMediaStreamInputPin *This = impl_from_AudioMediaStreamInputPin_IPin(&base->IPin_iface);
......@@ -1134,7 +1123,6 @@ static const BaseInputPinFuncTable AudioMediaStreamInputPin_FuncTable =
{
{
AudioMediaStreamInputPin_CheckMediaType,
AudioMediaStreamInputPin_GetMediaTypeVersion,
AudioMediaStreamInputPin_GetMediaType,
},
AudioMediaStreamInputPin_Receive,
......
dlls/qcap/avico.c
View file @ 9be79954
......@@ -473,11 +473,6 @@ static HRESULT WINAPI AVICompressorIn_CheckMediaType(BasePin *base, const AM_MED
return res == ICERR_OK ? S_OK : S_FALSE;
}
static LONG WINAPI AVICompressorIn_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI AVICompressorIn_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
TRACE("(%p)->(%d %p)\n", base, iPosition, amt);
......@@ -574,7 +569,6 @@ static HRESULT WINAPI AVICompressorIn_Receive(BaseInputPin *base, IMediaSample *
static const BaseInputPinFuncTable AVICompressorBaseInputPinVtbl = {
{
AVICompressorIn_CheckMediaType,
AVICompressorIn_GetMediaTypeVersion,
AVICompressorIn_GetMediaType
},
AVICompressorIn_Receive
......@@ -618,12 +612,6 @@ static const IPinVtbl AVICompressorOutputPinVtbl = {
BasePinImpl_NewSegment
};
static LONG WINAPI AVICompressorOut_GetMediaTypeVersion(BasePin *base)
{
FIXME("(%p)\n", base);
return 0;
}
static HRESULT WINAPI AVICompressorOut_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
AVICompressor *This = impl_from_IBaseFilter(base->pinInfo.pFilter);
......@@ -678,7 +666,6 @@ static HRESULT WINAPI AVICompressorOut_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable AVICompressorBaseOutputPinVtbl = {
{
NULL,
AVICompressorOut_GetMediaTypeVersion,
AVICompressorOut_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/qcap/avimux.c
View file @ 9be79954
......@@ -1245,11 +1245,6 @@ static HRESULT WINAPI AviMuxOut_AttemptConnection(BaseOutputPin *base,
return BaseOutputPinImpl_AttemptConnection(base, pReceivePin, pmt);
}
static LONG WINAPI AviMuxOut_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI AviMuxOut_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
TRACE("(%p)->(%d %p)\n", base, iPosition, amt);
......@@ -1306,7 +1301,6 @@ static HRESULT WINAPI AviMuxOut_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable AviMuxOut_BaseOutputFuncTable = {
{
AviMuxOut_CheckMediaType,
AviMuxOut_GetMediaTypeVersion,
AviMuxOut_GetMediaType
},
AviMuxOut_AttemptConnection,
......@@ -1585,11 +1579,6 @@ static HRESULT WINAPI AviMuxIn_CheckMediaType(BasePin *base, const AM_MEDIA_TYPE
return S_FALSE;
}
static LONG WINAPI AviMuxIn_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI AviMuxIn_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
return S_FALSE;
......@@ -1701,7 +1690,6 @@ static HRESULT WINAPI AviMuxIn_Receive(BaseInputPin *base, IMediaSample *pSample
static const BaseInputPinFuncTable AviMuxIn_BaseInputFuncTable = {
{
AviMuxIn_CheckMediaType,
AviMuxIn_GetMediaTypeVersion,
AviMuxIn_GetMediaType
},
AviMuxIn_Receive
......
dlls/qcap/smartteefilter.c
View file @ 9be79954
......@@ -279,11 +279,6 @@ static HRESULT WINAPI SmartTeeFilterInput_CheckMediaType(BasePin *base, const AM
return S_OK;
}
static LONG WINAPI SmartTeeFilterInput_GetMediaTypeVersion(BasePin *base)
{
return 0;
}
static HRESULT WINAPI SmartTeeFilterInput_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
SmartTeeFilter *This = impl_from_BasePin(base);
......@@ -425,7 +420,6 @@ static HRESULT WINAPI SmartTeeFilterInput_Receive(BaseInputPin *base, IMediaSamp
static const BaseInputPinFuncTable SmartTeeFilterInputFuncs = {
{
SmartTeeFilterInput_CheckMediaType,
SmartTeeFilterInput_GetMediaTypeVersion,
SmartTeeFilterInput_GetMediaType
},
SmartTeeFilterInput_Receive
......@@ -484,13 +478,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_CheckMediaType(BasePin *base, const
return S_OK;
}
static LONG WINAPI SmartTeeFilterCapture_GetMediaTypeVersion(BasePin *base)
{
SmartTeeFilter *This = impl_from_BasePin(base);
TRACE("(%p)\n", This);
return 0;
}
static HRESULT WINAPI SmartTeeFilterCapture_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
SmartTeeFilter *This = impl_from_BasePin(base);
......@@ -521,7 +508,6 @@ static HRESULT WINAPI SmartTeeFilterCapture_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable SmartTeeFilterCaptureFuncs = {
{
SmartTeeFilterCapture_CheckMediaType,
SmartTeeFilterCapture_GetMediaTypeVersion,
SmartTeeFilterCapture_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......@@ -583,13 +569,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_CheckMediaType(BasePin *base, const
return S_OK;
}
static LONG WINAPI SmartTeeFilterPreview_GetMediaTypeVersion(BasePin *base)
{
SmartTeeFilter *This = impl_from_BasePin(base);
TRACE("(%p)\n", This);
return 0;
}
static HRESULT WINAPI SmartTeeFilterPreview_GetMediaType(BasePin *base, int iPosition, AM_MEDIA_TYPE *amt)
{
SmartTeeFilter *This = impl_from_BasePin(base);
......@@ -620,7 +599,6 @@ static HRESULT WINAPI SmartTeeFilterPreview_BreakConnect(BaseOutputPin *base)
static const BaseOutputPinFuncTable SmartTeeFilterPreviewFuncs = {
{
SmartTeeFilterPreview_CheckMediaType,
SmartTeeFilterPreview_GetMediaTypeVersion,
SmartTeeFilterPreview_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/qcap/vfwcapture.c
View file @ 9be79954
......@@ -683,11 +683,6 @@ static HRESULT WINAPI VfwPin_GetMediaType(BasePin *pin, int iPosition, AM_MEDIA_
return hr;
}
static LONG WINAPI VfwPin_GetMediaTypeVersion(BasePin *iface)
{
return 1;
}
static HRESULT WINAPI VfwPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocator *pAlloc, ALLOCATOR_PROPERTIES *ppropInputRequest)
{
ALLOCATOR_PROPERTIES actual;
......@@ -707,7 +702,6 @@ static HRESULT WINAPI VfwPin_DecideBufferSize(BaseOutputPin *iface, IMemAllocato
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
VfwPin_CheckMediaType,
VfwPin_GetMediaTypeVersion,
VfwPin_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/quartz/filesource.c
View file @ 9be79954
......@@ -909,7 +909,6 @@ static HRESULT WINAPI FileAsyncReaderPin_DecideBufferSize(BaseOutputPin *iface,
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
FileAsyncReaderPin_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
FileAsyncReaderPin_GetMediaType
},
FileAsyncReaderPin_AttemptConnection,
......
dlls/quartz/parser.c
View file @ 9be79954
......@@ -424,7 +424,6 @@ HRESULT WINAPI Parser_QueryVendorInfo(IBaseFilter * iface, LPWSTR *pVendorInfo)
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
Parser_OutputPin_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
Parser_OutputPin_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/strmbase/pin.c
View file @ 9be79954
......@@ -306,15 +306,14 @@ HRESULT WINAPI BasePinImpl_QueryAccept(IPin * iface, const AM_MEDIA_TYPE * pmt)
return (This->pFuncsTable->pfnCheckMediaType(This, pmt) == S_OK ? S_OK : S_FALSE);
}
HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin * iface, IEnumMediaTypes ** ppEnum)
HRESULT WINAPI BasePinImpl_EnumMediaTypes(IPin *iface, IEnumMediaTypes **enum_media_types)
{
BasePin *This = impl_from_IPin(iface);
TRACE("(%p)->(%p)\n", This, ppEnum);
BasePin *pin = impl_from_IPin(iface);
/* override this method to allow enumeration of your types */
TRACE("iface %p, enum_media_types %p.\n", iface, enum_media_types);
return EnumMediaTypes_Construct(This, This->pFuncsTable->pfnGetMediaType, This->pFuncsTable->pfnGetMediaTypeVersion , ppEnum);
return EnumMediaTypes_Construct(pin, pin->pFuncsTable->pfnGetMediaType,
BasePinImpl_GetMediaTypeVersion, enum_media_types);
}
HRESULT WINAPI BasePinImpl_QueryInternalConnections(IPin * iface, IPin ** apPin, ULONG * cPin)
......
dlls/strmbase/renderer.c
View file @ 9be79954
......@@ -219,7 +219,6 @@ static const BaseFilterFuncTable RendererBaseFilterFuncTable = {
static const BaseInputPinFuncTable input_BaseInputFuncTable = {
{
BaseRenderer_Input_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
BasePinImpl_GetMediaType
},
BaseRenderer_Receive
......
dlls/strmbase/transform.c
View file @ 9be79954
......@@ -152,7 +152,6 @@ static const BaseFilterFuncTable tfBaseFuncTable = {
static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = {
{
TransformFilter_Input_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
BasePinImpl_GetMediaType
},
TransformFilter_Input_Receive
......@@ -161,7 +160,6 @@ static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = {
static const BaseOutputPinFuncTable tf_output_BaseOutputFuncTable = {
{
TransformFilter_Output_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
TransformFilter_Output_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/winegstreamer/gstdemux.c
View file @ 9be79954
......@@ -1872,7 +1872,6 @@ static const IPinVtbl GST_OutputPin_Vtbl = {
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
GSTOutPin_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
GSTOutPin_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
dlls/wineqtdecoder/qtsplitter.c
View file @ 9be79954
......@@ -1515,7 +1515,6 @@ static const IQualityControlVtbl QTOutPin_QualityControl_Vtbl = {
static const BaseOutputPinFuncTable output_BaseOutputFuncTable = {
{
QTOutPin_CheckMediaType,
BasePinImpl_GetMediaTypeVersion,
QTOutPin_GetMediaType
},
BaseOutputPinImpl_AttemptConnection,
......
include/wine/strmbase.h
View file @ 9be79954
......@@ -51,7 +51,6 @@ typedef struct BasePinFuncTable {
/* Required for QueryAccept(), Connect(), ReceiveConnection(). */
BasePin_CheckMediaType pfnCheckMediaType;
/* Required for BasePinImpl_EnumMediaTypes */
BasePin_GetMediaTypeVersion pfnGetMediaTypeVersion;
BasePin_GetMediaType pfnGetMediaType;
} BasePinFuncTable;
......
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