piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-07-21 21:30:19 -06:00
Code Issues Packages Projects Releases Wiki Activity

Nullsound killed - Fixes Issue 1082

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4907 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Marko Pusljar
2010-01-20 14:35:48 +00:00
parent ab509465d5
commit 2eeb3d5e9d
4 changed files with 3 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Source/Core/AudioCommon/Src/AudioCommon.cpp
View File

@ -20,7 +20,6 @@
#include "DSoundStream.h"
#include "AOSoundStream.h"
#include "AlsaSoundStream.h"
#include "NullSoundStream.h"
#include "CoreAudioSoundStream.h"
#include "OpenALStream.h"
#include "PulseAudioStream.h"
@ -46,8 +45,6 @@ namespace AudioCommon
soundStream = new CoreAudioSound(mixer);
else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
soundStream = new PulseAudio(mixer);
else if (backend == BACKEND_NULL && NullSound::isValid())
soundStream = new NullSound(mixer);
if (soundStream != NULL)
{
@ -62,14 +59,12 @@ namespace AudioCommon
*/
return soundStream;
}
PanicAlert("Could not initialize backend %s, falling back to NULL", backend.c_str());
PanicAlert("Could not initialize backend %s.", backend.c_str());
}
PanicAlert("Sound backend %s is not valid, falling back to NULL", backend.c_str());
PanicAlert("Sound backend %s is not valid.", backend.c_str());
delete soundStream;
soundStream = new NullSound(mixer);
soundStream->Start();
soundStream = NULL;
return NULL;
}
@ -104,8 +99,6 @@ namespace AudioCommon
backends.push_back(BACKEND_COREAUDIO);
if (PulseAudio::isValid())
backends.push_back(BACKEND_PULSEAUDIO);
if (NullSound::isValid())
backends.push_back(BACKEND_NULL);
return backends;
}