dmime: Rename IDirectMusicTrack8Impl to wave_track.

Signed-off-by: Michael Stefaniuc <mstefani@winehq.org>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Michael Stefaniuc 2019-11-12 22:53:50 +01:00 committed by Alexandre Julliard
parent 1c877651fb
commit cd522af05b
1 changed files with 47 additions and 51 deletions

View File

@ -40,7 +40,7 @@ static inline IDirectMusicWaveTrack *impl_from_IDirectMusicTrack8(IDirectMusicTr
return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface); return CONTAINING_RECORD(iface, IDirectMusicWaveTrack, IDirectMusicTrack8_iface);
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid, static HRESULT WINAPI wave_track_QueryInterface(IDirectMusicTrack8 *iface, REFIID riid,
void **ret_iface) void **ret_iface)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -63,7 +63,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_QueryInterface(IDirectMusicTrack8 *
return S_OK; return S_OK;
} }
static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface) static ULONG WINAPI wave_track_AddRef(IDirectMusicTrack8 *iface)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedIncrement(&This->ref); LONG ref = InterlockedIncrement(&This->ref);
@ -73,7 +73,7 @@ static ULONG WINAPI IDirectMusicTrack8Impl_AddRef(IDirectMusicTrack8 *iface)
return ref; return ref;
} }
static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface) static ULONG WINAPI wave_track_Release(IDirectMusicTrack8 *iface)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
LONG ref = InterlockedDecrement(&This->ref); LONG ref = InterlockedDecrement(&This->ref);
@ -88,15 +88,14 @@ static ULONG WINAPI IDirectMusicTrack8Impl_Release(IDirectMusicTrack8 *iface)
return ref; return ref;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_Init(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_Init(IDirectMusicTrack8 *iface, IDirectMusicSegment *pSegment)
IDirectMusicSegment *pSegment)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pSegment); FIXME("(%p, %p): stub\n", This, pSegment);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_InitPlay(IDirectMusicTrack8 *iface,
IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance, IDirectMusicSegmentState *pSegmentState, IDirectMusicPerformance *pPerformance,
void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags) void **ppStateData, DWORD dwVirtualTrack8ID, DWORD dwFlags)
{ {
@ -105,14 +104,14 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_InitPlay(IDirectMusicTrack8 *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_EndPlay(IDirectMusicTrack8 *iface, void *pStateData) static HRESULT WINAPI wave_track_EndPlay(IDirectMusicTrack8 *iface, void *pStateData)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %p): stub\n", This, pStateData); FIXME("(%p, %p): stub\n", This, pStateData);
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, void *pStateData, static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *pStateData,
MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags, MUSIC_TIME mtStart, MUSIC_TIME mtEnd, MUSIC_TIME mtOffset, DWORD dwFlags,
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
@ -121,7 +120,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Play(IDirectMusicTrack8 *iface, voi
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, static HRESULT WINAPI wave_track_GetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam) MUSIC_TIME mtTime, MUSIC_TIME *pmtNext, void *pParam)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -129,7 +128,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParam(IDirectMusicTrack8 *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType, static HRESULT WINAPI wave_track_SetParam(IDirectMusicTrack8 *iface, REFGUID rguidType,
MUSIC_TIME mtTime, void *pParam) MUSIC_TIME mtTime, void *pParam)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -137,8 +136,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParam(IDirectMusicTrack8 *iface,
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_IsParamSupported(IDirectMusicTrack8 *iface, REFGUID rguidType)
REFGUID rguidType)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -154,7 +152,15 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_IsParamSupported(IDirectMusicTrack8
return DMUS_E_TYPE_UNSUPPORTED; return DMUS_E_TYPE_UNSUPPORTED;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_AddNotificationType(IDirectMusicTrack8 *iface, REFGUID notiftype)
{
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
return E_NOTIMPL;
}
static HRESULT WINAPI wave_track_RemoveNotificationType(IDirectMusicTrack8 *iface,
REFGUID notiftype) REFGUID notiftype)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -163,16 +169,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_AddNotificationType(IDirectMusicTra
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_RemoveNotificationType(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
REFGUID notiftype)
{
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %s): method not implemented\n", This, debugstr_dmguid(notiftype));
return E_NOTIMPL;
}
static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MUSIC_TIME mtStart,
MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack) MUSIC_TIME mtEnd, IDirectMusicTrack **ppTrack)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -180,7 +177,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Clone(IDirectMusicTrack8 *iface, MU
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, void *pStateData, static HRESULT WINAPI wave_track_PlayEx(IDirectMusicTrack8 *iface, void *pStateData,
REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags, REFERENCE_TIME rtStart, REFERENCE_TIME rtEnd, REFERENCE_TIME rtOffset, DWORD dwFlags,
IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID) IDirectMusicPerformance *pPerf, IDirectMusicSegmentState *pSegSt, DWORD dwVirtualID)
{ {
@ -190,9 +187,9 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_PlayEx(IDirectMusicTrack8 *iface, v
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_GetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
REFGUID rguidType, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, REFERENCE_TIME rtTime, REFERENCE_TIME *prtNext, void *pParam, void *pStateData,
void *pStateData, DWORD dwFlags) DWORD dwFlags)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), FIXME("(%p, %s, 0x%s, %p, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
@ -200,8 +197,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_GetParamEx(IDirectMusicTrack8 *ifac
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_SetParamEx(IDirectMusicTrack8 *iface, REFGUID rguidType,
REFGUID rguidType, REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags) REFERENCE_TIME rtTime, void *pParam, void *pStateData, DWORD dwFlags)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType), FIXME("(%p, %s, 0x%s, %p, %p, %d): stub\n", This, debugstr_dmguid(rguidType),
@ -209,7 +206,7 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_SetParamEx(IDirectMusicTrack8 *ifac
return S_OK; return S_OK;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface, IUnknown *context, static HRESULT WINAPI wave_track_Compose(IDirectMusicTrack8 *iface, IUnknown *context,
DWORD trackgroup, IDirectMusicTrack **track) DWORD trackgroup, IDirectMusicTrack **track)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
@ -218,9 +215,8 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Compose(IDirectMusicTrack8 *iface,
return E_NOTIMPL; return E_NOTIMPL;
} }
static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface, static HRESULT WINAPI wave_track_Join(IDirectMusicTrack8 *iface, IDirectMusicTrack *newtrack,
IDirectMusicTrack *newtrack, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, MUSIC_TIME join, IUnknown *context, DWORD trackgroup, IDirectMusicTrack **resulttrack)
IDirectMusicTrack **resulttrack)
{ {
IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface); IDirectMusicWaveTrack *This = impl_from_IDirectMusicTrack8(iface);
TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context, TRACE("(%p, %p, %d, %p, %d, %p): method not implemented\n", This, newtrack, join, context,
@ -229,24 +225,24 @@ static HRESULT WINAPI IDirectMusicTrack8Impl_Join(IDirectMusicTrack8 *iface,
} }
static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = { static const IDirectMusicTrack8Vtbl dmtrack8_vtbl = {
IDirectMusicTrack8Impl_QueryInterface, wave_track_QueryInterface,
IDirectMusicTrack8Impl_AddRef, wave_track_AddRef,
IDirectMusicTrack8Impl_Release, wave_track_Release,
IDirectMusicTrack8Impl_Init, wave_track_Init,
IDirectMusicTrack8Impl_InitPlay, wave_track_InitPlay,
IDirectMusicTrack8Impl_EndPlay, wave_track_EndPlay,
IDirectMusicTrack8Impl_Play, wave_track_Play,
IDirectMusicTrack8Impl_GetParam, wave_track_GetParam,
IDirectMusicTrack8Impl_SetParam, wave_track_SetParam,
IDirectMusicTrack8Impl_IsParamSupported, wave_track_IsParamSupported,
IDirectMusicTrack8Impl_AddNotificationType, wave_track_AddNotificationType,
IDirectMusicTrack8Impl_RemoveNotificationType, wave_track_RemoveNotificationType,
IDirectMusicTrack8Impl_Clone, wave_track_Clone,
IDirectMusicTrack8Impl_PlayEx, wave_track_PlayEx,
IDirectMusicTrack8Impl_GetParamEx, wave_track_GetParamEx,
IDirectMusicTrack8Impl_SetParamEx, wave_track_SetParamEx,
IDirectMusicTrack8Impl_Compose, wave_track_Compose,
IDirectMusicTrack8Impl_Join wave_track_Join
}; };
static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream) static HRESULT WINAPI wave_IPersistStream_Load(IPersistStream *iface, IStream *stream)