summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/AOSoundStream.cpp
diff options
context:
space:
mode:
authornakeee <nakeee@gmail.com>2009-03-27 11:06:52 +0000
committernakeee <nakeee@gmail.com>2009-03-27 11:06:52 +0000
commitbffe311b3ebd4a42bececd4858dfea05de44618b (patch)
tree74df977b0cd4527320df5fefc18399a8119d4cfc /Source/Core/AudioCommon/Src/AOSoundStream.cpp
parentb5b42746ed4069589ea2cce7501b8cb5acd079ec (diff)
Fixed stop of DSP HLE+LLE and some clean up(reset all variables in DSound creation)
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@2760 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AOSoundStream.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/AOSoundStream.cpp12
1 files changed, 5 insertions, 7 deletions
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
index fdc507f5ee..c3cae83f74 100644
--- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp
+++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp
@@ -46,20 +46,15 @@ void AOSound::SoundLoop()
while (!threadData)
{
soundCriticalSection.Enter();
-
m_mixer->Mix(realtimeBuffer, numBytesToRender >> 2);
ao_play(device, (char*)realtimeBuffer, numBytesToRender);
-
soundCriticalSection.Leave();
if (! threadData)
soundSyncEvent.Wait();
}
-
ao_close(device);
- device = NULL;
- ao_shutdown();
-
+ device = NULL;
}
void *soundThread(void *args)
@@ -93,7 +88,10 @@ void AOSound::Stop()
delete thread;
thread = NULL;
soundSyncEvent.Shutdown();
-
}
+AOSound::~AOSound() {
+ // FIXME: crashes dolphin
+ // ao_shutdown();
+}
#endif