Alex/REDRIVER2
1
0
Fork 0
mirror of https://github.com/OpenDriver2/REDRIVER2.git synced 2024-11-22 18:32:42 +01:00
Code Issues Projects Releases Wiki Activity

- [Psy-X] [SPU-AL] attempt to fix incorrectly playing sounds caused by other thread calls

Browse Source
This commit is contained in:
Ilya Shurumov 2021-01-21 14:07:25 +06:00
parent 9d99bbedc5
commit 68cee07bac
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src_rebuild/PsyX/src/PSX/LIBSPU.C
View File

@ -75,6 +75,7 @@ struct SPUMemory
};
static SPUMemory s_SpuMemory;
SDL_mutex* g_SpuMutex = NULL;
struct SPUVoice
{
@ -220,6 +221,8 @@ bool Emulator_InitSound()
InitOpenAlEffects();
g_SpuMutex = SDL_CreateMutex();
return true;
}
@ -525,6 +528,8 @@ void UpdateVoiceSample(SPUVoice& voice)
void SpuSetVoiceAttr(SpuVoiceAttr *arg)
{
SDL_LockMutex(g_SpuMutex);
for (int i = 0; i < SPU_VOICES; i++)
{
if (!(arg->voice & SPU_VOICECH(i)))
@ -602,10 +607,12 @@ void SpuSetVoiceAttr(SpuVoiceAttr *arg)
// TODO: ADSR and other stuff
}
SDL_UnlockMutex(g_SpuMutex);
}
void SpuSetKey(long on_off, unsigned long voice_bit)
{
SDL_LockMutex(g_SpuMutex);
for (int i = 0; i < SPU_VOICES; i++)
{
if (voice_bit & SPU_VOICECH(i))
@ -630,12 +637,15 @@ void SpuSetKey(long on_off, unsigned long voice_bit)
}
}
}
SDL_UnlockMutex(g_SpuMutex);
}
long SpuGetKeyStatus(unsigned long voice_bit)
{
int state = AL_STOPPED;
SDL_LockMutex(g_SpuMutex);
for (int i = 0; i < SPU_VOICES; i++)
{
if (voice_bit != SPU_VOICECH(i))
@ -646,19 +656,21 @@ long SpuGetKeyStatus(unsigned long voice_bit)
ALuint alSource = voice.alSource;
if (alSource == AL_NONE)
{
return 0; // SpuOff?
}
break; // SpuOff?
alGetSourcei(alSource, AL_SOURCE_STATE, &state);
break;
}
SDL_UnlockMutex(g_SpuMutex);
return (state == AL_PLAYING); // simple as this?
}
void SpuGetAllKeysStatus(char* status)
{
SDL_LockMutex(g_SpuMutex);
for (int i = 0; i < SPU_VOICES; i++)
{
SPUVoice& voice = g_SpuVoices[i];
@ -676,6 +688,7 @@ void SpuGetAllKeysStatus(char* status)
status[i] = (state == AL_PLAYING);
}
SDL_UnlockMutex(g_SpuMutex);
}
void SpuSetKeyOnWithAttr(SpuVoiceAttr* attr)
@ -765,6 +778,8 @@ unsigned long SpuSetReverbVoice(long on_off, unsigned long voice_bit)
if(!g_ALEffectsSupported)
return 0;
SDL_LockMutex(g_SpuMutex);
for (int i = 0; i < SPU_VOICES; i++)
{
if (voice_bit & SPU_VOICECH(i))
@ -787,6 +802,8 @@ unsigned long SpuSetReverbVoice(long on_off, unsigned long voice_bit)
}
}
SDL_UnlockMutex(g_SpuMutex);
return 0;
}