Commit 89ecfe19 authored by Zebediah Figura's avatar Zebediah Figura Committed by Alexandre Julliard

dmusic: Store the master clock as an IReferenceClock pointer.

parent 78901fea
...@@ -72,7 +72,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface) ...@@ -72,7 +72,7 @@ static ULONG WINAPI IDirectMusic8Impl_Release(LPDIRECTMUSIC8 iface)
TRACE("(%p)->(): new ref = %u\n", This, ref); TRACE("(%p)->(): new ref = %u\n", This, ref);
if (!ref) { if (!ref) {
IReferenceClock_Release(&This->master_clock->IReferenceClock_iface); IReferenceClock_Release(This->master_clock);
if (This->dsound) if (This->dsound)
IDirectSound_Release(This->dsound); IDirectSound_Release(This->dsound);
HeapFree(GetProcessHeap(), 0, This->system_ports); HeapFree(GetProcessHeap(), 0, This->system_ports);
...@@ -246,9 +246,9 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG ...@@ -246,9 +246,9 @@ static HRESULT WINAPI IDirectMusic8Impl_GetMasterClock(LPDIRECTMUSIC8 iface, LPG
TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock); TRACE("(%p)->(%p, %p)\n", This, guid_clock, reference_clock);
if (guid_clock) if (guid_clock)
*guid_clock = This->master_clock->pClockInfo.guidClock; *guid_clock = GUID_NULL;
if (reference_clock) { if (reference_clock) {
*reference_clock = &This->master_clock->IReferenceClock_iface; *reference_clock = This->master_clock;
IReferenceClock_AddRef(*reference_clock); IReferenceClock_AddRef(*reference_clock);
} }
......
...@@ -111,7 +111,7 @@ struct IDirectMusic8Impl { ...@@ -111,7 +111,7 @@ struct IDirectMusic8Impl {
IDirectMusic8 IDirectMusic8_iface; IDirectMusic8 IDirectMusic8_iface;
LONG ref; LONG ref;
IDirectSound *dsound; IDirectSound *dsound;
IReferenceClockImpl *master_clock; IReferenceClock *master_clock;
IDirectMusicPort **ports; IDirectMusicPort **ports;
int num_ports; int num_ports;
port_info *system_ports; port_info *system_ports;
......
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