piwalker/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-11-15 05:47:56 -07:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source 
git-svn-id: https://dolphin-emu.googlecode.com/svn/trunk@4311 8ced0084-cf51-0410-be5f-012b33b47a6e
This commit is contained in:
Shawn Hoffman 2009-09-21 20:28:17 +00:00
parent 72f443c5ce
commit 8c5285eddf
3 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/Core/AudioCommon/Src/AOSoundStream.cpp
View File

@ -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 */);

4
Source/Core/Common/Src/FileSearch.cpp
View File

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

3
Source/Core/Common/Src/FileUtil.cpp
View File

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