From 1a3cd2d34cb9f4127b1f1ae3e38f7563eed39a02 Mon Sep 17 00:00:00 2001 From: Soren Jorvang Date: Tue, 18 Jan 2011 00:04:29 +0000 Subject: Remove the __APPLE__ workaround for reading config files from a ctor. '#' is a fairly accepted comment character for .ini files along with the more official ';', but '//' isn't. git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@6872 8ced0084-cf51-0410-be5f-012b33b47a6e --- Source/Core/AudioCommon/Src/AudioCommonConfig.cpp | 22 ++++++++-------------- 1 file changed, 8 insertions(+), 14 deletions(-) (limited to 'Source/Core/AudioCommon/Src/AudioCommonConfig.cpp') diff --git a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp index 9adaa186f2..20369858ee 100644 --- a/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp +++ b/Source/Core/AudioCommon/Src/AudioCommonConfig.cpp @@ -23,23 +23,17 @@ void AudioCommonConfig::Load(IniFile &file) { file.Get("Config", "EnableDTKMusic", &m_EnableDTKMusic, true); file.Get("Config", "EnableThrottle", &m_EnableThrottle, true); file.Get("Config", "EnableJIT", &m_EnableJIT, true); - file.Get("Config", "Volume", &m_Volume, 100); -#ifdef _WIN32 - file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); - file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); -#elif defined __APPLE__ - std::string temp; - file.Get("Config", "Backend", &temp, BACKEND_COREAUDIO); - strncpy(sBackend, temp.c_str(), 128); - file.Get("Config", "Frequency", &temp, "48,000 Hz"); - strncpy(sFrequency, temp.c_str(), 128); -#elif defined __linux__ +#if defined __linux__ && HAVE_ALSA file.Get("Config", "Backend", &sBackend, BACKEND_ALSA); - file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); +#elif defined __APPLE__ + file.Get("Config", "Backend", &sBackend, BACKEND_COREAUDIO); +#elif defined _WIN32 + file.Get("Config", "Backend", &sBackend, BACKEND_DIRECTSOUND); #else - file.Get("Config", "Backend", &sBackend, BACKEND_OPENAL); - file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); + file.Get("Config", "Backend", &sBackend, BACKEND_NULLSOUND); #endif + file.Get("Config", "Frequency", &sFrequency, "48,000 Hz"); + file.Get("Config", "Volume", &m_Volume, 100); } // Set the values for the file -- cgit v1.2.3