Merge branch 'master' into stable

1 files changed, 203 insertions, 0 deletions

diff --git a/Source/Core/AudioCommon/AudioCommon.cpp b/Source/Core/AudioCommon/AudioCommon.cpp
new file mode 100644
index 0000000000..f5438faca9
--- /dev/null
+++ b/Source/Core/AudioCommon/AudioCommon.cpp
@@ -0,0 +1,203 @@
+// Copyright 2009 Dolphin Emulator Project
+// Licensed under GPLv2+
+// Refer to the license.txt file included.
+
+
+#include "AudioCommon/AlsaSoundStream.h"
+#include "AudioCommon/AOSoundStream.h"
+#include "AudioCommon/AudioCommon.h"
+#include "AudioCommon/CoreAudioSoundStream.h"
+#include "AudioCommon/Mixer.h"
+#include "AudioCommon/NullSoundStream.h"
+#include "AudioCommon/OpenALStream.h"
+#include "AudioCommon/OpenSLESStream.h"
+#include "AudioCommon/PulseAudioStream.h"
+#include "AudioCommon/XAudio2_7Stream.h"
+#include "AudioCommon/XAudio2Stream.h"
+
+#include "Common/FileUtil.h"
+
+#include "Core/ConfigManager.h"
+#include "Core/Movie.h"
+
+// This shouldn't be a global, at least not here.
+SoundStream* g_sound_stream = nullptr;
+
+static bool s_audio_dump_start = false;
+
+namespace AudioCommon
+{
+	static const int AUDIO_VOLUME_MIN = 0;
+	static const int AUDIO_VOLUME_MAX = 100;
+
+	SoundStream* InitSoundStream()
+	{
+		std::string backend = SConfig::GetInstance().sBackend;
+		if (backend == BACKEND_OPENAL && OpenALStream::isValid())
+			g_sound_stream = new OpenALStream();
+		else if (backend == BACKEND_NULLSOUND && NullSound::isValid())
+			g_sound_stream = new NullSound();
+		else if (backend == BACKEND_XAUDIO2)
+		{
+			if (XAudio2::isValid())
+				g_sound_stream = new XAudio2();
+			else if (XAudio2_7::isValid())
+				g_sound_stream = new XAudio2_7();
+		}
+		else if (backend == BACKEND_AOSOUND && AOSound::isValid())
+			g_sound_stream = new AOSound();
+		else if (backend == BACKEND_ALSA && AlsaSound::isValid())
+			g_sound_stream = new AlsaSound();
+		else if (backend == BACKEND_COREAUDIO && CoreAudioSound::isValid())
+			g_sound_stream = new CoreAudioSound();
+		else if (backend == BACKEND_PULSEAUDIO && PulseAudio::isValid())
+			g_sound_stream = new PulseAudio();
+		else if (backend == BACKEND_OPENSLES && OpenSLESStream::isValid())
+			g_sound_stream = new OpenSLESStream();
+
+		if (!g_sound_stream && NullSound::isValid())
+		{
+			WARN_LOG(DSPHLE, "Could not initialize backend %s, using %s instead.",
+				backend.c_str(), BACKEND_NULLSOUND);
+			g_sound_stream = new NullSound();
+		}
+
+		if (g_sound_stream)
+		{
+			UpdateSoundStream();
+			if (g_sound_stream->Start())
+			{
+				if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
+					StartAudioDump();
+
+				return g_sound_stream;
+			}
+			PanicAlertT("Could not initialize backend %s.", backend.c_str());
+		}
+
+		PanicAlertT("Sound backend %s is not valid.", backend.c_str());
+
+		delete g_sound_stream;
+		g_sound_stream = nullptr;
+		return nullptr;
+	}
+
+	void ShutdownSoundStream()
+	{
+		INFO_LOG(DSPHLE, "Shutting down sound stream");
+
+		if (g_sound_stream)
+		{
+			g_sound_stream->Stop();
+			if (SConfig::GetInstance().m_DumpAudio && s_audio_dump_start)
+				StopAudioDump();
+			delete g_sound_stream;
+			g_sound_stream = nullptr;
+		}
+
+		INFO_LOG(DSPHLE, "Done shutting down sound stream");
+	}
+
+	std::vector<std::string> GetSoundBackends()
+	{
+		std::vector<std::string> backends;
+
+		if (NullSound::isValid())
+			backends.push_back(BACKEND_NULLSOUND);
+		if (XAudio2_7::isValid() || XAudio2::isValid())
+			backends.push_back(BACKEND_XAUDIO2);
+		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 (OpenALStream::isValid())
+			backends.push_back(BACKEND_OPENAL);
+		if (OpenSLESStream::isValid())
+			backends.push_back(BACKEND_OPENSLES);
+		return backends;
+	}
+
+	void UpdateSoundStream()
+	{
+		if (g_sound_stream)
+		{
+			int volume = SConfig::GetInstance().m_IsMuted ? 0 : SConfig::GetInstance().m_Volume;
+			g_sound_stream->SetVolume(volume);
+		}
+	}
+
+	void ClearAudioBuffer(bool mute)
+	{
+		if (g_sound_stream)
+			g_sound_stream->Clear(mute);
+	}
+
+	void SendAIBuffer(short *samples, unsigned int num_samples)
+	{
+		if (!g_sound_stream)
+			return;
+
+		if (SConfig::GetInstance().m_DumpAudio && !s_audio_dump_start)
+			StartAudioDump();
+		else if (!SConfig::GetInstance().m_DumpAudio && s_audio_dump_start)
+			StopAudioDump();
+
+		CMixer* pMixer = g_sound_stream->GetMixer();
+
+		if (pMixer && samples)
+		{
+			pMixer->PushSamples(samples, num_samples);
+		}
+
+		g_sound_stream->Update();
+	}
+
+	void StartAudioDump()
+	{
+		std::string audio_file_name_dtk = File::GetUserPath(D_DUMPAUDIO_IDX) + "dtkdump.wav";
+		std::string audio_file_name_dsp = File::GetUserPath(D_DUMPAUDIO_IDX) + "dspdump.wav";
+		File::CreateFullPath(audio_file_name_dtk);
+		File::CreateFullPath(audio_file_name_dsp);
+		g_sound_stream->GetMixer()->StartLogDTKAudio(audio_file_name_dtk);
+		g_sound_stream->GetMixer()->StartLogDSPAudio(audio_file_name_dsp);
+		s_audio_dump_start = true;
+	}
+
+	void StopAudioDump()
+	{
+		g_sound_stream->GetMixer()->StopLogDTKAudio();
+		g_sound_stream->GetMixer()->StopLogDSPAudio();
+		s_audio_dump_start = false;
+	}
+
+	void IncreaseVolume(unsigned short offset)
+	{
+		SConfig::GetInstance().m_IsMuted = false;
+		int& currentVolume = SConfig::GetInstance().m_Volume;
+		currentVolume += offset;
+		if (currentVolume > AUDIO_VOLUME_MAX)
+			currentVolume = AUDIO_VOLUME_MAX;
+		UpdateSoundStream();
+	}
+
+	void DecreaseVolume(unsigned short offset)
+	{
+		SConfig::GetInstance().m_IsMuted = false;
+		int& currentVolume = SConfig::GetInstance().m_Volume;
+		currentVolume -= offset;
+		if (currentVolume < AUDIO_VOLUME_MIN)
+			currentVolume = AUDIO_VOLUME_MIN;
+		UpdateSoundStream();
+	}
+
+	void ToggleMuteVolume()
+	{
+		bool& isMuted = SConfig::GetInstance().m_IsMuted;
+		isMuted = !isMuted;
+		UpdateSoundStream();
+	}
+}