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
This commit is contained in:
Soren Jorvang
2011-02-05 16:06:05 +00:00
parent 04fcd9499a
commit 98e24f5873
15 changed files with 43 additions and 60 deletions

View File

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