strmbase: Rename the "pFuncsTable" field of struct strmbase_filter to "ops".

Signed-off-by: Zebediah Figura <z.figura12@gmail.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Zebediah Figura 2019-10-23 20:04:25 -05:00 committed by Alexandre Julliard
parent 0f8dbcdf80
commit f7232d4e2c
3 changed files with 10 additions and 10 deletions

View File

@ -59,7 +59,7 @@ HRESULT enum_pins_create(struct strmbase_filter *base, IEnumPins **out)
IBaseFilter_AddRef(&base->IBaseFilter_iface);
object->Version = base->pin_version;
while ((pin = base->pFuncsTable->filter_get_pin(base, object->count)))
while ((pin = base->ops->filter_get_pin(base, object->count)))
++object->count;
TRACE("Created enumerator %p.\n", object);
@ -137,7 +137,7 @@ static HRESULT WINAPI IEnumPinsImpl_Next(IEnumPins * iface, ULONG cPins, IPin **
for (i = 0; i < cPins; ++i)
{
IPin *pin = This->base->pFuncsTable->filter_get_pin(This->base, This->uIndex + i);
IPin *pin = This->base->ops->filter_get_pin(This->base, This->uIndex + i);
if (!pin)
break;
@ -180,7 +180,7 @@ static HRESULT WINAPI IEnumPinsImpl_Reset(IEnumPins *iface)
if (enum_pins->Version != enum_pins->base->pin_version)
{
enum_pins->count = 0;
while ((pin = enum_pins->base->pFuncsTable->filter_get_pin(enum_pins->base, enum_pins->count)))
while ((pin = enum_pins->base->ops->filter_get_pin(enum_pins->base, enum_pins->count)))
++enum_pins->count;
}

View File

@ -36,8 +36,8 @@ static HRESULT WINAPI filter_inner_QueryInterface(IUnknown *iface, REFIID iid, v
*out = NULL;
if (filter->pFuncsTable->filter_query_interface
&& SUCCEEDED(hr = filter->pFuncsTable->filter_query_interface(filter, iid, out)))
if (filter->ops->filter_query_interface
&& SUCCEEDED(hr = filter->ops->filter_query_interface(filter, iid, out)))
{
return hr;
}
@ -78,7 +78,7 @@ static ULONG WINAPI filter_inner_Release(IUnknown *iface)
TRACE("%p decreasing refcount to %u.\n", filter, refcount);
if (!refcount)
filter->pFuncsTable->filter_destroy(filter);
filter->ops->filter_destroy(filter);
return refcount;
}
@ -229,7 +229,7 @@ HRESULT WINAPI BaseFilterImpl_FindPin(IBaseFilter *iface, const WCHAR *id, IPin
TRACE("(%p)->(%s, %p)\n", This, debugstr_w(id), ret);
for (i = 0; (pin = This->pFuncsTable->filter_get_pin(This, i)); ++i)
for (i = 0; (pin = This->ops->filter_get_pin(This, i)); ++i)
{
hr = IPin_QueryPinInfo(pin, &info);
if (FAILED(hr))
@ -292,7 +292,7 @@ VOID WINAPI BaseFilterImpl_IncrementPinVersion(struct strmbase_filter *filter)
}
void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl *vtbl, IUnknown *outer,
const CLSID *clsid, const struct strmbase_filter_ops *func_table)
const CLSID *clsid, const struct strmbase_filter_ops *ops)
{
memset(filter, 0, sizeof(*filter));
@ -306,7 +306,7 @@ void strmbase_filter_init(struct strmbase_filter *filter, const IBaseFilterVtbl
filter->csFilter.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": strmbase_filter.csFilter");
filter->clsid = *clsid;
filter->pin_version = 1;
filter->pFuncsTable = func_table;
filter->ops = ops;
}
void strmbase_filter_cleanup(struct strmbase_filter *This)

View File

@ -162,7 +162,7 @@ struct strmbase_filter
CLSID clsid;
LONG pin_version;
const struct strmbase_filter_ops *pFuncsTable;
const struct strmbase_filter_ops *ops;
};
struct strmbase_filter_ops