ShuriZma
/
dolphin
mirror of https://github.com/dolphin-emu/dolphin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Nullsound killed - Fixes Issue 1082 

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/AudioCommon.vcproj
View File

@ -428,10 +428,6 @@
RelativePath=".\Src\DSoundStream.h"
>
</File>
<File
RelativePath=".\Src\NullSoundStream.h"
>
</File>
<File
RelativePath=".\Src\OpenALStream.cpp"
>

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;
}

1
Source/Core/AudioCommon/Src/AudioCommonConfig.h
View File

@ -28,7 +28,6 @@
#define BACKEND_OPENAL "OpenAL"
#define BACKEND_ALSA "ALSA"
#define BACKEND_PULSEAUDIO "Pulse"
#define BACKEND_NULL "NullSound"
struct AudioCommonConfig
{

54
Source/Core/AudioCommon/Src/NullSoundStream.h
View File

@ -1,54 +0,0 @@
// Copyright (C) 2003 Dolphin Project.
// This program is free software: you can redistribute it and/or modify
// it under the terms of the GNU General Public License as published by
// the Free Software Foundation, version 2.0.
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License 2.0 for more details.
// A copy of the GPL 2.0 should have been included with the program.
// If not, see http://www.gnu.org/licenses/
// Official SVN repository and contact information can be found at
// http://code.google.com/p/dolphin-emu/
#ifndef _NULLSOUNDSTREAM_H_
#define _NULLSOUNDSTREAM_H_
#include "SoundStream.h"
#include "Mixer.h"
class NullMixer : public CMixer {
public:
virtual unsigned int Mix(short *samples, unsigned int numSamples) { return 0; }
virtual void PushSamples(short* samples, unsigned int num_samples) {}
};
class NullSound : public SoundStream
{
public:
NullSound(CMixer *mixer) : SoundStream(mixer)
{
delete m_mixer;
m_mixer = new NullMixer();
}
virtual ~NullSound() {}
static bool isValid() {
return true;
}
virtual bool Start() { return true; }
virtual void Update() {
//m_mixer->Mix(NULL, 256 >> 2);
//(*callback)(NULL, 256 >> 2, 16, sampleRate, 2);
}
};
#endif //_NULLSOUNDSTREAM_H_