summaryrefslogtreecommitdiff
path: root/Source/Core/AudioCommon/Src/AudioCommon.cpp
diff options
context:
space:
mode:
authorayuanx <ayuanx@gmail.com>2009-12-22 07:26:30 +0000
committerayuanx <ayuanx@gmail.com>2009-12-22 07:26:30 +0000
commit24d88397938f13d2d55493a0fc2d7032dd2e531e (patch)
tree0c6150cd07d4d1535328952177a3ae7169f45155 /Source/Core/AudioCommon/Src/AudioCommon.cpp
parenta1fefe870c2566cbc6ede9b4fed8b48417305ba5 (diff)
Sound System Rework: Phase 1
. Fixed Sample Rate for DSP (Now if your CPU is capable to run game at 100%, you will get pure sound without buzz or static noise) . Fixed Sample Rate for AI (Now if your CPU is capable to run game at 100%, you will get sync'ed video and audio) . Fixed Backend list for DSPLLE . Improved Aduio DMA a bit (There might be a completely redesign in following phases) WARNING: The whole rework will take time to complete. This commit is compilable, but could be unstable. So you can try it and test it but don't take it as a release rev! git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4717 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
-rw-r--r--Source/Core/AudioCommon/Src/AudioCommon.cpp30
1 files changed, 14 insertions, 16 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp
index 1bea5458ff..4a52615134 100644
--- a/Source/Core/AudioCommon/Src/AudioCommon.cpp
+++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp
@@ -34,19 +34,19 @@ namespace AudioCommon
mixer = new CMixer();
std::string backend = ac_Config.sBackend;
- if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
- soundStream = new CoreAudioSound(mixer);
- if (backend == BACKEND_DIRECTSOUND && DSound::isValid())
+ if (backend == BACKEND_OPENAL && OpenALStream::isValid())
+ soundStream = new OpenALStream(mixer);
+ else if (backend == BACKEND_DIRECTSOUND && DSound::isValid())
soundStream = new DSound(mixer, g_dspInitialize.hWnd);
- if (backend == BACKEND_AOSOUND && AOSound::isValid())
+ else if (backend == BACKEND_AOSOUND && AOSound::isValid())
soundStream = new AOSound(mixer);
- if (backend == BACKEND_OPENAL && OpenALStream::isValid())
- soundStream = new OpenALStream(mixer);
- if (backend == BACKEND_ALSA && AlsaSound::isValid())
+ else if (backend == BACKEND_ALSA && AlsaSound::isValid())
soundStream = new AlsaSound(mixer);
- if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
+ else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
+ soundStream = new CoreAudioSound(mixer);
+ else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
soundStream = new PulseAudio(mixer);
- if (backend == BACKEND_NULL && NullSound::isValid())
+ else if (backend == BACKEND_NULL && NullSound::isValid())
soundStream = new NullSound(mixer);
if (soundStream != NULL)
@@ -60,12 +60,10 @@ namespace AudioCommon
soundStream->StartLogAudio(FULL_DUMP_DIR g_Config.recordFile);
}
*/
-
return soundStream;
}
PanicAlert("Could not initialize backend %s, falling back to NULL", backend.c_str());
}
-
PanicAlert("Sound backend %s is not valid, falling back to NULL", backend.c_str());
delete soundStream;
@@ -77,7 +75,7 @@ namespace AudioCommon
void ShutdownSoundStream()
{
- NOTICE_LOG(DSPHLE, "Shutting down sound stream");
+ INFO_LOG(DSPHLE, "Shutting down sound stream");
if (soundStream)
{
@@ -94,16 +92,16 @@ namespace AudioCommon
{
std::vector<std::string> backends;
- if (CoreAudioSound::isValid())
- backends.push_back(BACKEND_COREAUDIO);
if (DSound::isValid())
backends.push_back(BACKEND_DIRECTSOUND);
- if (AOSound::isValid())
- backends.push_back(BACKEND_AOSOUND);
if (OpenALStream::isValid())
backends.push_back(BACKEND_OPENAL);
+ if (AOSound::isValid())
+ backends.push_back(BACKEND_AOSOUND);
if (AlsaSound::isValid())
backends.push_back(BACKEND_ALSA);
+ if (CoreAudioSound::isValid())
+ backends.push_back(BACKEND_COREAUDIO);
if (PulseAudio::isValid())
backends.push_back(BACKEND_PULSEAUDIO);
if (NullSound::isValid())