libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-27 05:32:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Changed mutex usage.

Browse Source 
It now unlocks the mutex while it's loading mp3/ogg/wave data in order to have the sound thread play normally.
The ps2's cd/dvd drive is too slow to transfer the entire file within a few millisecs, so it made the sound skip.

svn-id: r16831
This commit is contained in:
Robert Göffringmann 2005-02-20 19:06:09 +00:00
parent b455a94e0f
commit 78533d416f
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
sword1/music.cpp
View File

@ -285,9 +285,9 @@ void Music::giveVolume(uint8 *volL, uint8 *volR) {
}
void Music::startMusic(int32 tuneId, int32 loopFlag) {
Common::StackLock lock(_mutex);
if (strlen(_tuneList[tuneId]) > 0) {
int newStream = 0;
_mutex.lock();
if (_handles[0].streaming() && _handles[1].streaming()) {
int streamToStop;
// Both streams playing - one must be forced to stop.
@ -318,15 +318,25 @@ void Music::startMusic(int32 tuneId, int32 loopFlag) {
_handles[1].fadeDown();
newStream = 0;
}
delete _converter[newStream];
_converter[newStream] = NULL;
_mutex.unlock();
/* The handle will load the music file now. It can take a while, so unlock
the mutex before, to have the soundthread playing normally.
As the corresponding _converter is NULL, the handle will be ignored by the playing thread */
if (_handles[newStream].play(_tuneList[tuneId], loopFlag != 0)) {
delete _converter[newStream];
_mutex.lock();
_converter[newStream] = makeRateConverter(_handles[newStream].getRate(), _mixer->getOutputRate(), _handles[newStream].isStereo(), false);
_mutex.unlock();
}
} else {
_mutex.lock();
if (_handles[0].streaming())
_handles[0].fadeDown();
if (_handles[1].streaming())
_handles[1].fadeDown();
_mutex.unlock();
}
}