From f982d75691dcccc03341508e05031aa8b1c77100 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 12 Apr 2003 18:10:50 +0000 Subject: [PATCH] Fix locking. (Oops, I guess this is a remnant of the original test code, that did use SDL audio ...) --- stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp | 3 +-- stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp | 3 +-- stepmania/src/arch/Sound/RageSoundDriver_Null.cpp | 3 +-- stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp index a61d22a5b8..c32e03fdf3 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_ALSA9.cpp @@ -163,9 +163,8 @@ void RageSound_ALSA9::StartMixing(RageSound *snd) sound *s = new sound; s->snd = snd; - SDL_LockAudio(); + LockMutex L(SOUNDMAN->lock); sounds.push_back(s); - SDL_UnlockAudio(); } void RageSound_ALSA9::Update(float delta) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp index b03918c42a..860b361920 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_DSound_Software.cpp @@ -103,9 +103,8 @@ void RageSound_DSound_Software::StartMixing(RageSound *snd) sound *s = new sound; s->snd = snd; - SDL_LockAudio(); + LockMut(SOUNDMAN->lock); sounds.push_back(s); - SDL_UnlockAudio(); } void RageSound_DSound_Software::Update(float delta) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp index 3d8d03f9bf..15c1153c03 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_Null.cpp @@ -89,9 +89,8 @@ void RageSound_Null::StartMixing(RageSound *snd) sound *s = new sound; s->snd = snd; - SDL_LockAudio(); + LockMutex L(SOUNDMAN->lock); sounds.push_back(s); - SDL_UnlockAudio(); } void RageSound_Null::Update(float delta) diff --git a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp index 1896c2866b..24163e9a29 100644 --- a/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp +++ b/stepmania/src/arch/Sound/RageSoundDriver_WaveOut.cpp @@ -115,9 +115,8 @@ void RageSound_WaveOut::StartMixing(RageSound *snd) sound *s = new sound; s->snd = snd; - SDL_LockAudio(); + LockMutex L(SOUNDMAN->lock); sounds.push_back(s); - SDL_UnlockAudio(); } void RageSound_WaveOut::Update(float delta)