Commit 8a8c5a82 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

strmbase: Rename pfnGetPin to filter_get_pin.

parent 97546ca0
...@@ -191,7 +191,7 @@ static const IBaseFilterVtbl basefilter_vtbl = ...@@ -191,7 +191,7 @@ static const IBaseFilterVtbl basefilter_vtbl =
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI evr_get_pin(BaseFilter *iface, unsigned int index)
{ {
FIXME("iface %p, index %u, stub!\n", iface, index); FIXME("iface %p, index %u, stub!\n", iface, index);
return NULL; return NULL;
...@@ -199,7 +199,7 @@ static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index) ...@@ -199,7 +199,7 @@ static IPin * WINAPI filter_GetPin(BaseFilter *iface, unsigned int index)
static const BaseFilterFuncTable basefilter_functable = static const BaseFilterFuncTable basefilter_functable =
{ {
filter_GetPin, .filter_get_pin = evr_get_pin,
}; };
HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv) HRESULT evr_filter_create(IUnknown *outer_unk, void **ppv)
......
...@@ -171,14 +171,14 @@ static const IBaseFilterVtbl AudioRecordVtbl = { ...@@ -171,14 +171,14 @@ static const IBaseFilterVtbl AudioRecordVtbl = {
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
static IPin * WINAPI AudioRecord_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI audio_record_get_pin(BaseFilter *iface, unsigned int index)
{ {
FIXME("iface %p, index %u, stub!\n", iface, index); FIXME("iface %p, index %u, stub!\n", iface, index);
return NULL; return NULL;
} }
static const BaseFilterFuncTable AudioRecordFuncs = { static const BaseFilterFuncTable AudioRecordFuncs = {
AudioRecord_GetPin, .filter_get_pin = audio_record_get_pin,
}; };
static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv) static HRESULT WINAPI PPB_QueryInterface(IPersistPropertyBag *iface, REFIID riid, LPVOID *ppv)
......
...@@ -244,7 +244,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = { ...@@ -244,7 +244,7 @@ static const IBaseFilterVtbl AVICompressorVtbl = {
AVICompressor_QueryVendorInfo AVICompressor_QueryVendorInfo
}; };
static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI avi_compressor_get_pin(BaseFilter *iface, unsigned int index)
{ {
AVICompressor *This = impl_from_BaseFilter(iface); AVICompressor *This = impl_from_BaseFilter(iface);
IPin *ret; IPin *ret;
...@@ -261,7 +261,7 @@ static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index) ...@@ -261,7 +261,7 @@ static IPin * WINAPI AVICompressor_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable filter_func_table = { static const BaseFilterFuncTable filter_func_table = {
AVICompressor_GetPin, .filter_get_pin = avi_compressor_get_pin,
}; };
static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface) static AVICompressor *impl_from_IPersistPropertyBag(IPersistPropertyBag *iface)
......
...@@ -116,7 +116,7 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter) ...@@ -116,7 +116,7 @@ static inline AviMux* impl_from_BaseFilter(BaseFilter *filter)
return CONTAINING_RECORD(filter, AviMux, filter); return CONTAINING_RECORD(filter, AviMux, filter);
} }
static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI avi_mux_get_pin(BaseFilter *iface, unsigned int index)
{ {
AviMux *This = impl_from_BaseFilter(iface); AviMux *This = impl_from_BaseFilter(iface);
...@@ -135,7 +135,7 @@ static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index) ...@@ -135,7 +135,7 @@ static IPin * WINAPI AviMux_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable filter_func_table = { static const BaseFilterFuncTable filter_func_table = {
AviMux_GetPin, .filter_get_pin = avi_mux_get_pin,
}; };
static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface) static inline AviMux* impl_from_IBaseFilter(IBaseFilter *iface)
......
...@@ -199,7 +199,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = { ...@@ -199,7 +199,7 @@ static const IBaseFilterVtbl SmartTeeFilterVtbl = {
BaseFilterImpl_QueryVendorInfo BaseFilterImpl_QueryVendorInfo
}; };
static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI smart_tee_get_pin(BaseFilter *iface, unsigned int index)
{ {
SmartTeeFilter *This = impl_from_BaseFilter(iface); SmartTeeFilter *This = impl_from_BaseFilter(iface);
IPin *ret; IPin *ret;
...@@ -218,7 +218,7 @@ static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index ...@@ -218,7 +218,7 @@ static IPin * WINAPI SmartTeeFilter_GetPin(BaseFilter *iface, unsigned int index
} }
static const BaseFilterFuncTable SmartTeeFilterFuncs = { static const BaseFilterFuncTable SmartTeeFilterFuncs = {
SmartTeeFilter_GetPin, .filter_get_pin = smart_tee_get_pin,
}; };
static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface) static ULONG WINAPI SmartTeeFilterInput_AddRef(IPin *iface)
......
...@@ -192,7 +192,7 @@ static const IUnknownVtbl unknown_inner_vtbl = ...@@ -192,7 +192,7 @@ static const IUnknownVtbl unknown_inner_vtbl =
unknown_inner_Release, unknown_inner_Release,
}; };
static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI vfw_capture_get_pin(BaseFilter *iface, unsigned int index)
{ {
VfwCapture *This = impl_from_BaseFilter(iface); VfwCapture *This = impl_from_BaseFilter(iface);
...@@ -204,7 +204,7 @@ static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index) ...@@ -204,7 +204,7 @@ static IPin * WINAPI VfwCapture_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable BaseFuncTable = { static const BaseFilterFuncTable BaseFuncTable = {
VfwCapture_GetPin, .filter_get_pin = vfw_capture_get_pin,
}; };
IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr) IUnknown * WINAPI QCAP_createVFWCaptureFilter(IUnknown *pUnkOuter, HRESULT *phr)
......
...@@ -339,7 +339,7 @@ static const IUnknownVtbl samplegrabber_vtbl = ...@@ -339,7 +339,7 @@ static const IUnknownVtbl samplegrabber_vtbl =
SampleGrabber_Release, SampleGrabber_Release,
}; };
static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI sample_grabber_get_pin(BaseFilter *iface, unsigned int index)
{ {
SG_Impl *This = impl_from_BaseFilter(iface); SG_Impl *This = impl_from_BaseFilter(iface);
IPin *pin; IPin *pin;
...@@ -356,7 +356,7 @@ static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index) ...@@ -356,7 +356,7 @@ static IPin * WINAPI SampleGrabber_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable basefunc_vtbl = { static const BaseFilterFuncTable basefunc_vtbl = {
SampleGrabber_GetPin, .filter_get_pin = sample_grabber_get_pin,
}; };
/* Helper that buffers data and/or calls installed sample callbacks */ /* Helper that buffers data and/or calls installed sample callbacks */
......
...@@ -392,7 +392,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID * ...@@ -392,7 +392,7 @@ HRESULT GetClassMediaFile(IAsyncReader * pReader, LPCOLESTR pszFileName, GUID *
return hr; return hr;
} }
static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI async_reader_get_pin(BaseFilter *iface, unsigned int index)
{ {
AsyncReader *This = impl_from_BaseFilter(iface); AsyncReader *This = impl_from_BaseFilter(iface);
...@@ -404,7 +404,7 @@ static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index) ...@@ -404,7 +404,7 @@ static IPin * WINAPI AsyncReader_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable BaseFuncTable = { static const BaseFilterFuncTable BaseFuncTable = {
AsyncReader_GetPin, .filter_get_pin = async_reader_get_pin,
}; };
HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv) HRESULT AsyncReader_create(IUnknown * pUnkOuter, LPVOID * ppv)
......
...@@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface ) ...@@ -62,7 +62,7 @@ static inline ParserImpl *impl_from_BaseFilter( BaseFilter *iface )
return CONTAINING_RECORD(iface, ParserImpl, filter); return CONTAINING_RECORD(iface, ParserImpl, filter);
} }
static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI parser_get_pin(BaseFilter *iface, unsigned int index)
{ {
ParserImpl *filter = impl_from_BaseFilter(iface); ParserImpl *filter = impl_from_BaseFilter(iface);
...@@ -74,7 +74,7 @@ static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index) ...@@ -74,7 +74,7 @@ static IPin * WINAPI Parser_GetPin(BaseFilter *iface, unsigned int index)
} }
static const BaseFilterFuncTable BaseFuncTable = { static const BaseFilterFuncTable BaseFuncTable = {
Parser_GetPin, .filter_get_pin = parser_get_pin,
}; };
HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl, HRESULT Parser_Create(ParserImpl *pParser, const IBaseFilterVtbl *Parser_Vtbl,
......
...@@ -59,7 +59,7 @@ HRESULT enum_pins_create(BaseFilter *base, IEnumPins **out) ...@@ -59,7 +59,7 @@ HRESULT enum_pins_create(BaseFilter *base, IEnumPins **out)
IBaseFilter_AddRef(&base->IBaseFilter_iface); IBaseFilter_AddRef(&base->IBaseFilter_iface);
object->Version = base->pin_version; object->Version = base->pin_version;
while ((pin = base->pFuncsTable->pfnGetPin(base, object->count))) while ((pin = base->pFuncsTable->filter_get_pin(base, object->count)))
{ {
IPin_Release(pin); IPin_Release(pin);
++object->count; ++object->count;
...@@ -141,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin ** ...@@ -141,7 +141,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin **
while (i < cPins) while (i < cPins)
{ {
IPin *pin; IPin *pin;
pin = This->base->pFuncsTable->pfnGetPin(This->base, This->uIndex + i); pin = This->base->pFuncsTable->filter_get_pin(This->base, This->uIndex + i);
if (!pin) if (!pin)
break; break;
...@@ -185,7 +185,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface) ...@@ -185,7 +185,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface)
if (enum_pins->Version != enum_pins->base->pin_version) if (enum_pins->Version != enum_pins->base->pin_version)
{ {
enum_pins->count = 0; enum_pins->count = 0;
while ((pin = enum_pins->base->pFuncsTable->pfnGetPin(enum_pins->base, enum_pins->count))) while ((pin = enum_pins->base->pFuncsTable->filter_get_pin(enum_pins->base, enum_pins->count)))
{ {
IPin_Release(pin); IPin_Release(pin);
++enum_pins->count; ++enum_pins->count;
......
...@@ -144,7 +144,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin ...@@ -144,7 +144,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin
TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret); TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret);
for (i = 0; (pin = This->pFuncsTable->pfnGetPin(This, i)); ++i) for (i = 0; (pin = This->pFuncsTable->filter_get_pin(This, i)); ++i)
{ {
hr = IPin_QueryPinInfo(pin, &info); hr = IPin_QueryPinInfo(pin, &info);
if (FAILED(hr)) if (FAILED(hr))
......
...@@ -183,7 +183,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl = ...@@ -183,7 +183,7 @@ static const IPinVtbl BaseRenderer_InputPin_Vtbl =
BaseInputPinImpl_NewSegment BaseInputPinImpl_NewSegment
}; };
static IPin * WINAPI BaseRenderer_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI renderer_get_pin(BaseFilter *iface, unsigned int index)
{ {
BaseRenderer *This = impl_from_BaseFilter(iface); BaseRenderer *This = impl_from_BaseFilter(iface);
...@@ -207,7 +207,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa ...@@ -207,7 +207,7 @@ static HRESULT WINAPI BaseRenderer_Receive(BaseInputPin *pin, IMediaSample * pSa
} }
static const BaseFilterFuncTable RendererBaseFilterFuncTable = { static const BaseFilterFuncTable RendererBaseFilterFuncTable = {
BaseRenderer_GetPin, .filter_get_pin = renderer_get_pin,
}; };
static const BaseInputPinFuncTable input_BaseInputFuncTable = { static const BaseInputPinFuncTable input_BaseInputFuncTable = {
......
...@@ -128,7 +128,7 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo ...@@ -128,7 +128,7 @@ static HRESULT WINAPI TransformFilter_Output_GetMediaType(BasePin *This, int iPo
return S_OK; return S_OK;
} }
static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index) static IPin * WINAPI transform_get_pin(BaseFilter *iface, unsigned int index)
{ {
TransformFilter *filter = impl_from_BaseFilter(iface); TransformFilter *filter = impl_from_BaseFilter(iface);
...@@ -140,7 +140,7 @@ static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index ...@@ -140,7 +140,7 @@ static IPin *WINAPI TransformFilter_GetPin(BaseFilter *iface, unsigned int index
} }
static const BaseFilterFuncTable tfBaseFuncTable = { static const BaseFilterFuncTable tfBaseFuncTable = {
TransformFilter_GetPin, .filter_get_pin = transform_get_pin,
}; };
static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = { static const BaseInputPinFuncTable tf_input_BaseInputFuncTable = {
......
...@@ -1196,7 +1196,7 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface ) ...@@ -1196,7 +1196,7 @@ static inline GSTOutPin *impl_from_IMediaSeeking( IMediaSeeking *iface )
return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface); return CONTAINING_RECORD(iface, GSTOutPin, seek.IMediaSeeking_iface);
} }
static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) static IPin * WINAPI gstdemux_get_pin(BaseFilter *base, unsigned int index)
{ {
GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface); GSTImpl *This = impl_from_IBaseFilter(&base->IBaseFilter_iface);
IPin *pin; IPin *pin;
...@@ -1214,7 +1214,7 @@ static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index) ...@@ -1214,7 +1214,7 @@ static IPin* WINAPI GST_GetPin(BaseFilter *base, unsigned int index)
} }
static const BaseFilterFuncTable BaseFuncTable = { static const BaseFilterFuncTable BaseFuncTable = {
GST_GetPin, .filter_get_pin = gstdemux_get_pin,
}; };
IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr) IUnknown * CALLBACK Gstreamer_Splitter_create(IUnknown *pUnkOuter, HRESULT *phr)
......
...@@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface ) ...@@ -202,7 +202,7 @@ static inline QTSplitter *impl_from_IBaseFilter( IBaseFilter *iface )
* Base Filter * Base Filter
*/ */
static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) static IPin * WINAPI qt_splitter_get_pin(BaseFilter *base, unsigned int index)
{ {
QTSplitter *filter = impl_from_BaseFilter(base); QTSplitter *filter = impl_from_BaseFilter(base);
...@@ -234,7 +234,7 @@ static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index) ...@@ -234,7 +234,7 @@ static IPin * WINAPI QT_GetPin(BaseFilter *base, unsigned int index)
} }
static const BaseFilterFuncTable BaseFuncTable = { static const BaseFilterFuncTable BaseFuncTable = {
QT_GetPin, .filter_get_pin = qt_splitter_get_pin,
}; };
IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr) IUnknown * CALLBACK QTSplitter_create(IUnknown *punkout, HRESULT *phr)
......
...@@ -168,11 +168,9 @@ typedef struct BaseFilter ...@@ -168,11 +168,9 @@ typedef struct BaseFilter
const struct BaseFilterFuncTable* pFuncsTable; const struct BaseFilterFuncTable* pFuncsTable;
} BaseFilter; } BaseFilter;
typedef IPin * (WINAPI *BaseFilter_GetPin)(BaseFilter *iface, unsigned int index); typedef struct BaseFilterFuncTable
{
typedef struct BaseFilterFuncTable { IPin *(WINAPI *filter_get_pin)(BaseFilter *iface, unsigned int index);
/* Required */
BaseFilter_GetPin pfnGetPin;
} BaseFilterFuncTable; } BaseFilterFuncTable;
HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv); HRESULT WINAPI BaseFilterImpl_QueryInterface(IBaseFilter * iface, REFIID riid, LPVOID * ppv);
......
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