diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2009-09-21 20:28:17 +0000 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2009-09-21 20:28:17 +0000 |
| commit | 8c5285eddffd8c554205d24baaf522be4f2fe4b2 (patch) | |
| tree | 38e1dd6feb40a4a8f7e1ba7cc3a7b01fd0c88cdb /Source/Core | |
| parent | 72f443c5ce07e2af23fd173465c79b3142bd2bc3 (diff) | |
fix some path issues on OSX, also libao for osx only supports 44.1kHz...awesome...who calls writing the CoreAudio backend so we can kill libao? :D
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4311 8ced0084-cf51-0410-be5f-012b33b47a6e
Diffstat (limited to 'Source/Core')
| -rw-r--r-- | Source/Core/AudioCommon/Src/AOSoundStream.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Src/FileSearch.cpp | 4 | ||||
| -rw-r--r-- | Source/Core/Common/Src/FileUtil.cpp | 3 |
3 files changed, 9 insertions, 2 deletions
diff --git a/Source/Core/AudioCommon/Src/AOSoundStream.cpp b/Source/Core/AudioCommon/Src/AOSoundStream.cpp index 568fe56e0a..646d011022 100644 --- a/Source/Core/AudioCommon/Src/AOSoundStream.cpp +++ b/Source/Core/AudioCommon/Src/AOSoundStream.cpp @@ -29,7 +29,11 @@ void AOSound::SoundLoop() default_driver = ao_default_driver_id(); format.bits = 16; format.channels = 2; +#ifdef __APPLE__ + format.rate = 44100; // libao for osx only supports 44.1kHz... +#else format.rate = m_mixer->GetSampleRate(); +#endif format.byte_format = AO_FMT_LITTLE; device = ao_open_live(default_driver, &format, NULL /* no options */); diff --git a/Source/Core/Common/Src/FileSearch.cpp b/Source/Core/Common/Src/FileSearch.cpp index 0cc7225f1c..363f578e24 100644 --- a/Source/Core/Common/Src/FileSearch.cpp +++ b/Source/Core/Common/Src/FileSearch.cpp @@ -101,7 +101,11 @@ void CFileSearch::FindFiles(const std::string& _searchString, const std::string& if ( (s.size() > ext.size()) && (!strcasecmp(s.substr(s.size() - ext.size()).c_str(), ext.c_str())) ) { +#ifdef __APPLE__ + std::string full_name = _strPath + s; +#else std::string full_name = _strPath + "/" + s; +#endif m_FileNames.push_back(full_name); } } diff --git a/Source/Core/Common/Src/FileUtil.cpp b/Source/Core/Common/Src/FileUtil.cpp index 41d68200a5..b8b3427da5 100644 --- a/Source/Core/Common/Src/FileUtil.cpp +++ b/Source/Core/Common/Src/FileUtil.cpp @@ -562,9 +562,8 @@ std::string GetPluginsDirectory() pluginsDir = PLUGINS_DIR; #endif -#if !defined (__APPLE__) pluginsDir += DIR_SEP; -#endif + INFO_LOG(COMMON, "GetPluginsDirectory: Setting to %s:", pluginsDir.c_str()); return pluginsDir; |