Archive/dca3-game
0
0
Fork 0
mirror of https://gitlab.com/skmp/dca3-game.git synced 2025-04-28 13:07:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

PreloadStreamedFile: stop if playing

Browse source
This commit is contained in:
Stefanos Kornilios Mitsis Poiitidis 2025-02-24 13:13:36 +02:00
parent 30274cf9f9
commit 0a90f1fc49
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
miami/audio/sampman_dc.cpp
View file

@ -1073,14 +1073,22 @@ cSampleManager::PreloadStreamedFile(uint32 nFile, uint8 nStream, uint32_t seek_b
{
std::lock_guard<std::mutex> lk(streams[nStream].mtx);
// Do we gotta stop it here?
assert(!streams[nStream].playing);
// Stop if playing
// Keep in sync with StopStreamedFile
if (streams[nStream].playing) {
streams[nStream].playing = false;
aica_stop_chn(streams[nStream].mapped_ch[0]);
aica_stop_chn(streams[nStream].mapped_ch[1]);
if (streams[nStream].fd >= 0) {
CdStreamDiscardAudioRead(streams[nStream].fd);
fs_close(streams[nStream].fd);
}
}
streams[nStream].rate = hdr.samplesPerSec;
streams[nStream].stereo = hdr.numOfChan == 2;
if (streams[nStream].fd >= 0) {
CdStreamDiscardAudioRead(streams[nStream].fd);
fs_close(streams[nStream].fd);
}
streams[nStream].fd = f;
streams[nStream].playing = false;
streams[nStream].total_samples = hdr.dataSize * 2 / hdr.numOfChan;
@ -1218,6 +1226,8 @@ cSampleManager::StopStreamedFile(uint8 nStream)
ASSERT( nStream < MAX_STREAMS );
verbosef("StopStreamedFile(%d)\n", nStream);
std::lock_guard<std::mutex> lk(streams[nStream].mtx);
// Keep in sync with PreloadStreamedFile
streams[nStream].playing = false;
aica_stop_chn(streams[nStream].mapped_ch[0]);