system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-10-07 10:44:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

dmime: Generate track flags while in loop.

Browse source 
Store track_flags inside segment state so that they can be reused in
subsequent calls.  The start/seek/loop flags are now properly set when
calling IDirectMusicTrack_Play().

Signed-off-by: Eric Pouech <epouech@codeweavers.com>
This commit is contained in:
Eric Pouech 2024-01-30 15:41:12 +01:00 committed by Alexandre Julliard
parent dfaa45069e
commit ef2830b620
2 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
dlls/dmime/segmentstate.c
View file

@ -56,6 +56,7 @@ struct segment_state
MUSIC_TIME played;
BOOL auto_download;
DWORD repeats, actual_repeats;
DWORD track_flags;
struct list tracks;
};
@ -385,12 +386,13 @@ static HRESULT segment_state_play_until(struct segment_state *This, IDirectMusic
}
This->played = played;
This->track_flags &= ~(DMUS_TRACKF_START|DMUS_TRACKF_DIRTY);
if (This->start_point + This->played >= This->end_point) return S_FALSE;
return S_OK;
}
static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusicPerformance8 *performance,
REFERENCE_TIME duration, DWORD track_flags)
REFERENCE_TIME duration)
{
IDirectMusicSegmentState *iface = (IDirectMusicSegmentState *)&This->IDirectMusicSegmentState8_iface;
MUSIC_TIME next_time;
@ -404,7 +406,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic
time + duration, &next_time)))
return hr;
while ((hr = segment_state_play_until(This, performance, next_time, track_flags)) == S_FALSE)
while ((hr = segment_state_play_until(This, performance, next_time, This->track_flags)) == S_FALSE)
{
if (!This->actual_repeats)
{
@ -424,6 +426,7 @@ static HRESULT segment_state_play_chunk(struct segment_state *This, IDirectMusic
break;
This->start_time += This->end_point - This->start_point;
This->actual_repeats--;
This->track_flags |= DMUS_TRACKF_LOOP | DMUS_TRACKF_SEEK;
if (next_time <= This->start_time || This->end_point <= This->start_point) break;
}
@ -444,8 +447,8 @@ HRESULT segment_state_play(IDirectMusicSegmentState *iface, IDirectMusicPerforma
return hr;
}
if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000,
DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY)))
This->track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY;
if (FAILED(hr = segment_state_play_chunk(This, performance, 10000000)))
return hr;
if (hr == S_FALSE) return S_OK;
@ -458,7 +461,7 @@ HRESULT segment_state_tick(IDirectMusicSegmentState *iface, IDirectMusicPerforma
TRACE("%p %p\n", iface, performance);
return segment_state_play_chunk(This, performance, 10000000, 0);
return segment_state_play_chunk(This, performance, 10000000);
}
HRESULT segment_state_stop(IDirectMusicSegmentState *iface, IDirectMusicPerformance8 *performance)

7
dlls/dmime/wavetrack.c
View file

@ -147,6 +147,7 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat
MUSIC_TIME start_time, MUSIC_TIME end_time, MUSIC_TIME time_offset, DWORD track_flags,
IDirectMusicPerformance *performance, IDirectMusicSegmentState *segment_state, DWORD track_id)
{
static const DWORD handled_track_flags = DMUS_TRACKF_START | DMUS_TRACKF_SEEK | DMUS_TRACKF_DIRTY | DMUS_TRACKF_LOOP;
struct wave_track *This = impl_from_IDirectMusicTrack8(iface);
LONG volume = This->header.lVolume;
IDirectMusicGraph *graph;
@ -157,9 +158,11 @@ static HRESULT WINAPI wave_track_Play(IDirectMusicTrack8 *iface, void *state_dat
TRACE("(%p, %p, %ld, %ld, %ld, %#lx, %p, %p, %ld)\n", This, state_data, start_time, end_time,
time_offset, track_flags, performance, segment_state, track_id);
if (track_flags) FIXME("track_flags %#lx not implemented\n", track_flags);
if (track_flags & ~handled_track_flags)
FIXME("track_flags %#lx not implemented\n", track_flags & ~handled_track_flags);
if (segment_state) FIXME("segment_state %p not implemented\n", segment_state);
if (!(track_flags & DMUS_TRACKF_START)) return S_OK;
if (!(track_flags & (DMUS_TRACKF_START | DMUS_TRACKF_LOOP))) return S_OK;
if (FAILED(hr = IDirectMusicPerformance_QueryInterface(performance,
&IID_IDirectMusicGraph, (void **)&graph)))