diff options
| author | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-05 16:06:05 +0000 |
|---|---|---|
| committer | Soren Jorvang <soren.jorvang@gmail.com> | 2011-02-05 16:06:05 +0000 |
| commit | 98e24f587368272e867fe09c39fb11d4550e7e3e (patch) | |
| tree | b5cf36d9f91c00162b502bc9bbad2f6de4752283 /Source/Core/AudioCommon | |
| parent | 04fcd9499a0e83b19c27c8b2b16830147d87714b (diff) | |
The compiler need not obey the static keyword, so to avoid linker
problems, whole functions in .h files need to also be static in
case they are included in several .cpp files.
Also a few other minor LTO fixes.
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@7082 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core/AudioCommon')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AudioCommon.cpp | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/Source/Core/AudioCommon/Src/AudioCommon.cpp b/Source/Core/AudioCommon/Src/AudioCommon.cpp index 8d8c2e7b84..547c0a8fe6 100644 --- a/Source/Core/AudioCommon/Src/AudioCommon.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommon.cpp @@ -30,10 +30,6 @@ namespace AudioCommon { SoundStream *InitSoundStream(CMixer *mixer, void *hWnd) { - // This looks evil. - if (!mixer) - mixer = new CMixer(); - std::string backend = ac_Config.sBackend; if (backend == BACKEND_OPENAL && OpenALStream::isValid()) soundStream = new OpenALStream(mixer); @@ -57,12 +53,11 @@ namespace AudioCommon ac_Config.Update(); if (soundStream->Start()) { +#if 0 // Start the sound recording - /* - if (ac_Config.record) { - soundStream->StartLogAudio(FULL_DUMP_DIR g_Config.recordFile); - } - */ + if (ac_Config.record) + soundStream->StartLogAudio(FULL_DUMP_DIR g_Config.recordFile); +#endif return soundStream; } PanicAlertT("Could not initialize backend %s.", backend.c_str()); @@ -81,7 +76,10 @@ namespace AudioCommon if (soundStream) { soundStream->Stop(); - soundStream->StopLogAudio(); +#if 0 + if (ac_Config.record) + soundStream->StopLogAudio(); +#endif delete soundStream; soundStream = NULL; } |