diff options
| author | LPFaint99 <lpfaint99@gmail.com> | 2009-07-06 02:10:26 +0000 |
|---|---|---|
| committer | LPFaint99 <lpfaint99@gmail.com> | 2009-07-06 02:10:26 +0000 |
| commit | a41c1b2d0a9fab51f8a75ccdb7dba0890f766820 (patch) | |
| tree | 5cc47f2330d83ece993db6443e944c103235821b /Source/Core/AudioCommon/Src/AudioCommon.cpp | |
| parent | 23f3e327e2f96843b0deebafddef12d195d73381 (diff) | |
add *.user, Win32, and x64 build dir to ignore list for DebuggerUICommon and Unit Tests
add *.aps to ignore list for DolphinWX dir
add eol-style native to 120 or so files
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@3689 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon/Src/AudioCommon.cpp')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 176 |
1 files changed, 88 insertions, 88 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 9e7100451a..8c7ca0a524 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -1,88 +1,88 @@ -// Copyright (C) 2003-2009 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/
-
-#include "AudioCommon.h"
-#include "Mixer.h"
-#include "DSoundStream.h"
-#include "AOSoundStream.h"
-#include "NullSoundStream.h"
-#include "OpenALStream.h"
-
-namespace AudioCommon
-{
- SoundStream *InitSoundStream(CMixer *mixer)
- {
- if (!mixer)
- mixer = new CMixer();
-
- std::string backend = ac_Config.sBackend;
- if (backend == BACKEND_DIRECTSOUND && DSound::isValid()) soundStream = new DSound(mixer, g_dspInitialize.hWnd);
- if (backend == BACKEND_AOSOUND && AOSound::isValid()) soundStream = new AOSound(mixer);
- if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer);
- if (backend == BACKEND_NULL && NullSound::isValid()) soundStream = new NullSound(mixer);
-
- if (soundStream != NULL) {
- ac_Config.Update();
- if (soundStream->Start()) {
- // Start the sound recording
- /*
- if (ac_Config.record) {
- 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;
- soundStream = new NullSound(mixer);
- soundStream->Start();
-
- return NULL;
- }
-
- void ShutdownSoundStream()
- {
- NOTICE_LOG(DSPHLE, "Shutting down sound stream");
-
- if (soundStream)
- {
- soundStream->Stop();
- soundStream->StopLogAudio();
- delete soundStream;
- soundStream = NULL;
- }
-
- INFO_LOG(DSPHLE, "Done shutting down sound stream");
- }
-
- std::vector<std::string> GetSoundBackends()
- {
- std::vector<std::string> backends;
-
- 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 (NullSound::isValid()) backends.push_back(BACKEND_NULL);
-
- return backends;
- }
-}
+// Copyright (C) 2003-2009 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/ + +#include "AudioCommon.h" +#include "Mixer.h" +#include "DSoundStream.h" +#include "AOSoundStream.h" +#include "NullSoundStream.h" +#include "OpenALStream.h" + +namespace AudioCommon +{ + SoundStream *InitSoundStream(CMixer *mixer) + { + if (!mixer) + mixer = new CMixer(); + + std::string backend = ac_Config.sBackend; + if (backend == BACKEND_DIRECTSOUND && DSound::isValid()) soundStream = new DSound(mixer, g_dspInitialize.hWnd); + if (backend == BACKEND_AOSOUND && AOSound::isValid()) soundStream = new AOSound(mixer); + if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); + if (backend == BACKEND_NULL && NullSound::isValid()) soundStream = new NullSound(mixer); + + if (soundStream != NULL) { + ac_Config.Update(); + if (soundStream->Start()) { + // Start the sound recording + /* + if (ac_Config.record) { + 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; + soundStream = new NullSound(mixer); + soundStream->Start(); + + return NULL; + } + + void ShutdownSoundStream() + { + NOTICE_LOG(DSPHLE, "Shutting down sound stream"); + + if (soundStream) + { + soundStream->Stop(); + soundStream->StopLogAudio(); + delete soundStream; + soundStream = NULL; + } + + INFO_LOG(DSPHLE, "Done shutting down sound stream"); + } + + std::vector<std::string> GetSoundBackends() + { + std::vector<std::string> backends; + + 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 (NullSound::isValid()) backends.push_back(BACKEND_NULL); + + return backends; + } +} |
