Skip to content

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

amstream: Use shorter names for IMediaStreamFilter methods.

Signed-off-by: 's avatarZebediah Figura <z.figura12@gmail.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent bbd4641b
Hide whitespace changes
Inline Side-by-side
Showing with 56 additions and 56 deletions
dlls/amstream/Makefile.in
View file @ c8b94b63
......@@ -6,9 +6,9 @@ EXTRADLLFLAGS = -mno-cygwin
C_SRCS = \
amstream.c \
audiodata.c \
filter.c \
main.c \
mediastream.c \
mediastreamfilter.c
mediastream.c
IDL_SRCS = amstream_classes.idl
......
dlls/amstream/amstream_private.h
View file @ c8b94b63
......@@ -36,7 +36,7 @@
HRESULT AM_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT AMAudioData_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT MediaStreamFilter_create(IUnknown *pUnkOuter, LPVOID *ppObj) DECLSPEC_HIDDEN;
HRESULT filter_create(IUnknown *outer, void **out) DECLSPEC_HIDDEN;
HRESULT ddrawmediastream_create(IMultiMediaStream *Parent, const MSPID *pPurposeId,
IUnknown *stream_object, STREAM_TYPE StreamType, IAMMediaStream **ppMediaStream) DECLSPEC_HIDDEN;
HRESULT audiomediastream_create(IMultiMediaStream *parent, const MSPID *purpose_id,
......
dlls/amstream/mediastreamfilter.c → dlls/amstream/filter.c
View file @ c8b94b63
......@@ -178,7 +178,7 @@ static inline struct filter *impl_from_IMediaStreamFilter(IMediaStreamFilter *if
return CONTAINING_RECORD(iface, struct filter, IMediaStreamFilter_iface);
}
static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface)
static HRESULT WINAPI filter_QueryInterface(IMediaStreamFilter *iface, REFIID riid, void **ret_iface)
{
TRACE("(%p)->(%s, %p)\n", iface, debugstr_guid(riid), ret_iface);
......@@ -200,7 +200,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryInterface(IMediaStreamFilter *i
return E_NOINTERFACE;
}
static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface)
static ULONG WINAPI filter_AddRef(IMediaStreamFilter *iface)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
ULONG refcount = InterlockedIncrement(&filter->refcount);
......@@ -210,7 +210,7 @@ static ULONG WINAPI MediaStreamFilterImpl_AddRef(IMediaStreamFilter *iface)
return refcount;
}
static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface)
static ULONG WINAPI filter_Release(IMediaStreamFilter *iface)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
ULONG refcount = InterlockedDecrement(&filter->refcount);
......@@ -235,34 +235,34 @@ static ULONG WINAPI MediaStreamFilterImpl_Release(IMediaStreamFilter *iface)
return refcount;
}
static HRESULT WINAPI MediaStreamFilterImpl_GetClassID(IMediaStreamFilter *iface, CLSID *clsid)
static HRESULT WINAPI filter_GetClassID(IMediaStreamFilter *iface, CLSID *clsid)
{
*clsid = CLSID_MediaStreamFilter;
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_Stop(IMediaStreamFilter *iface)
static HRESULT WINAPI filter_Stop(IMediaStreamFilter *iface)
{
FIXME("(%p)->(): Stub!\n", iface);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_Pause(IMediaStreamFilter *iface)
static HRESULT WINAPI filter_Pause(IMediaStreamFilter *iface)
{
FIXME("(%p)->(): Stub!\n", iface);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_Run(IMediaStreamFilter *iface, REFERENCE_TIME start)
static HRESULT WINAPI filter_Run(IMediaStreamFilter *iface, REFERENCE_TIME start)
{
FIXME("(%p)->(%s): Stub!\n", iface, wine_dbgstr_longlong(start));
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter *iface, DWORD timeout, FILTER_STATE *state)
static HRESULT WINAPI filter_GetState(IMediaStreamFilter *iface, DWORD timeout, FILTER_STATE *state)
{
FIXME("iface %p, timeout %u, state %p, stub!\n", iface, timeout, state);
......@@ -270,7 +270,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetState(IMediaStreamFilter *iface,
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter *iface, IReferenceClock *clock)
static HRESULT WINAPI filter_SetSyncSource(IMediaStreamFilter *iface, IReferenceClock *clock)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
......@@ -289,7 +289,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_SetSyncSource(IMediaStreamFilter *if
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *iface, IReferenceClock **clock)
static HRESULT WINAPI filter_GetSyncSource(IMediaStreamFilter *iface, IReferenceClock **clock)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
......@@ -306,7 +306,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetSyncSource(IMediaStreamFilter *if
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins)
static HRESULT WINAPI filter_EnumPins(IMediaStreamFilter *iface, IEnumPins **enum_pins)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
struct enum_pins *object;
......@@ -343,7 +343,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_EnumPins(IMediaStreamFilter *iface,
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, const WCHAR *id, IPin **out)
static HRESULT WINAPI filter_FindPin(IMediaStreamFilter *iface, const WCHAR *id, IPin **out)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
unsigned int i;
......@@ -381,7 +381,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_FindPin(IMediaStreamFilter *iface, c
return VFW_E_NOT_FOUND;
}
static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)
static HRESULT WINAPI filter_QueryFilterInfo(IMediaStreamFilter *iface, FILTER_INFO *info)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
......@@ -399,7 +399,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryFilterInfo(IMediaStreamFilter *
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter *iface,
static HRESULT WINAPI filter_JoinFilterGraph(IMediaStreamFilter *iface,
IFilterGraph *graph, const WCHAR *name)
{
struct filter *filter = impl_from_IMediaStreamFilter(iface);
......@@ -419,7 +419,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_JoinFilterGraph(IMediaStreamFilter *
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter *iface, LPWSTR *vendor_info)
static HRESULT WINAPI filter_QueryVendorInfo(IMediaStreamFilter *iface, LPWSTR *vendor_info)
{
WARN("iface %p, vendor_info %p, stub!\n", iface, vendor_info);
return E_NOTIMPL;
......@@ -427,7 +427,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_QueryVendorInfo(IMediaStreamFilter *
/*** IMediaStreamFilter methods ***/
static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* iface, IAMMediaStream *pAMMediaStream)
static HRESULT WINAPI filter_AddMediaStream(IMediaStreamFilter *iface, IAMMediaStream *pAMMediaStream)
{
struct filter *This = impl_from_IMediaStreamFilter(iface);
IAMMediaStream** streams;
......@@ -452,7 +452,7 @@ static HRESULT WINAPI MediaStreamFilterImpl_AddMediaStream(IMediaStreamFilter* i
return S_OK;
}
static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* iface, REFMSPID idPurpose, IMediaStream **ppMediaStream)
static HRESULT WINAPI filter_GetMediaStream(IMediaStreamFilter *iface, REFMSPID idPurpose, IMediaStream **ppMediaStream)
{
struct filter *This = impl_from_IMediaStreamFilter(iface);
MSPID purpose_id;
......@@ -474,84 +474,84 @@ static HRESULT WINAPI MediaStreamFilterImpl_GetMediaStream(IMediaStreamFilter* i
return MS_E_NOSTREAM;
}
static HRESULT WINAPI MediaStreamFilterImpl_EnumMediaStreams(IMediaStreamFilter* iface, LONG Index, IMediaStream **ppMediaStream)
static HRESULT WINAPI filter_EnumMediaStreams(IMediaStreamFilter *iface, LONG Index, IMediaStream **ppMediaStream)
{
FIXME("(%p)->(%d,%p): Stub!\n", iface, Index, ppMediaStream);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_SupportSeeking(IMediaStreamFilter* iface, BOOL bRenderer)
static HRESULT WINAPI filter_SupportSeeking(IMediaStreamFilter *iface, BOOL bRenderer)
{
FIXME("(%p)->(%d): Stub!\n", iface, bRenderer);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_ReferenceTimeToStreamTime(IMediaStreamFilter* iface, REFERENCE_TIME *pTime)
static HRESULT WINAPI filter_ReferenceTimeToStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pTime)
{
FIXME("(%p)->(%p): Stub!\n", iface, pTime);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_GetCurrentStreamTime(IMediaStreamFilter* iface, REFERENCE_TIME *pCurrentStreamTime)
static HRESULT WINAPI filter_GetCurrentStreamTime(IMediaStreamFilter *iface, REFERENCE_TIME *pCurrentStreamTime)
{
FIXME("(%p)->(%p): Stub!\n", iface, pCurrentStreamTime);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_WaitUntil(IMediaStreamFilter* iface, REFERENCE_TIME WaitStreamTime)
static HRESULT WINAPI filter_WaitUntil(IMediaStreamFilter *iface, REFERENCE_TIME WaitStreamTime)
{
FIXME("(%p)->(%s): Stub!\n", iface, wine_dbgstr_longlong(WaitStreamTime));
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_Flush(IMediaStreamFilter* iface, BOOL bCancelEOS)
static HRESULT WINAPI filter_Flush(IMediaStreamFilter *iface, BOOL bCancelEOS)
{
FIXME("(%p)->(%d): Stub!\n", iface, bCancelEOS);
return E_NOTIMPL;
}
static HRESULT WINAPI MediaStreamFilterImpl_EndOfStream(IMediaStreamFilter* iface)
static HRESULT WINAPI filter_EndOfStream(IMediaStreamFilter *iface)
{
FIXME("(%p)->(): Stub!\n", iface);
return E_NOTIMPL;
}
static const IMediaStreamFilterVtbl MediaStreamFilter_Vtbl =
{
MediaStreamFilterImpl_QueryInterface,
MediaStreamFilterImpl_AddRef,
MediaStreamFilterImpl_Release,
MediaStreamFilterImpl_GetClassID,
MediaStreamFilterImpl_Stop,
MediaStreamFilterImpl_Pause,
MediaStreamFilterImpl_Run,
MediaStreamFilterImpl_GetState,
MediaStreamFilterImpl_SetSyncSource,
MediaStreamFilterImpl_GetSyncSource,
MediaStreamFilterImpl_EnumPins,
MediaStreamFilterImpl_FindPin,
MediaStreamFilterImpl_QueryFilterInfo,
MediaStreamFilterImpl_JoinFilterGraph,
MediaStreamFilterImpl_QueryVendorInfo,
MediaStreamFilterImpl_AddMediaStream,
MediaStreamFilterImpl_GetMediaStream,
MediaStreamFilterImpl_EnumMediaStreams,
MediaStreamFilterImpl_SupportSeeking,
MediaStreamFilterImpl_ReferenceTimeToStreamTime,
MediaStreamFilterImpl_GetCurrentStreamTime,
MediaStreamFilterImpl_WaitUntil,
MediaStreamFilterImpl_Flush,
MediaStreamFilterImpl_EndOfStream
static const IMediaStreamFilterVtbl filter_vtbl =
{
filter_QueryInterface,
filter_AddRef,
filter_Release,
filter_GetClassID,
filter_Stop,
filter_Pause,
filter_Run,
filter_GetState,
filter_SetSyncSource,
filter_GetSyncSource,
filter_EnumPins,
filter_FindPin,
filter_QueryFilterInfo,
filter_JoinFilterGraph,
filter_QueryVendorInfo,
filter_AddMediaStream,
filter_GetMediaStream,
filter_EnumMediaStreams,
filter_SupportSeeking,
filter_ReferenceTimeToStreamTime,
filter_GetCurrentStreamTime,
filter_WaitUntil,
filter_Flush,
filter_EndOfStream
};
HRESULT MediaStreamFilter_create(IUnknown *outer, void **out)
HRESULT filter_create(IUnknown *outer, void **out)
{
struct filter *object;
......@@ -563,7 +563,7 @@ HRESULT MediaStreamFilter_create(IUnknown *outer, void **out)
if (!(object = heap_alloc_zero(sizeof(*object))))
return E_OUTOFMEMORY;
object->IMediaStreamFilter_iface.lpVtbl = &MediaStreamFilter_Vtbl;
object->IMediaStreamFilter_iface.lpVtbl = &filter_vtbl;
object->refcount = 1;
InitializeCriticalSection(&object->cs);
object->cs.DebugInfo->Spare[0] = (DWORD_PTR)(__FILE__ ": MediaStreamFilter.cs");
......
dlls/amstream/main.c
View file @ c8b94b63
......@@ -76,7 +76,7 @@ static const struct object_creation_info object_creation[] =
{ &CLSID_AMMultiMediaStream, AM_create },
{ &CLSID_AMDirectDrawStream, AM_create },
{ &CLSID_AMAudioData, AMAudioData_create },
{ &CLSID_MediaStreamFilter, MediaStreamFilter_create }
{ &CLSID_MediaStreamFilter, filter_create }
};
static HRESULT WINAPI AMCF_QueryInterface(IClassFactory *iface, REFIID riid, void **ppobj)
......
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