From 2eeb3d5e9dce29512921c1129e7b61e5a71ac893 Mon Sep 17 00:00:00 2001 From: Marko Pusljar Date: Wed, 20 Jan 2010 14:35:48 +0000 Subject: Nullsound killed - Fixes Issue 1082 git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4907 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/AudioCommon.cpp | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 4a52615134..f34b04acfa 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -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; } -- cgit v1.2.3