mirror/Aquaria
1
0
Fork 0
mirror of https://github.com/AquariaOSE/Aquaria.git synced 2025-08-07 22:59:50 +00:00
Code Issues Releases Wiki Activity

More linux file name case issues...

Browse source
This commit is contained in:
fgenesis 2012-06-14 19:06:06 +02:00
parent 8f2279e28a
commit 5b7757530f
1 changed files with 12 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

35
BBGE/SoundManager.cpp
View file

@ -925,15 +925,13 @@ bool SoundManager::playVoice(const std::string &name, SoundVoiceType svt, float
if (!voicePath2.empty()) if (!voicePath2.empty())
{ {
fn = voicePath2 + name + fileType; fn = core->adjustFilenameCase(voicePath2 + name + fileType);
stringToLower(fn);
if (exists(fn)) checkOther = false; if (exists(fn)) checkOther = false;
} }
if (checkOther) if (checkOther)
{ {
fn = voicePath + name + fileType; fn = core->adjustFilenameCase(voicePath + name + fileType);
stringToLower(fn);
if (!exists(fn)) if (!exists(fn))
{ {
debugLog("Could not find voice file [" + fn + "]"); debugLog("Could not find voice file [" + fn + "]");
@ -1281,27 +1279,25 @@ bool SoundManager::playMusic(const std::string &name, SoundLoopType slt, SoundFa
if (!name.empty() && name[0] == '.') if (!name.empty() && name[0] == '.')
{ {
fn = name; fn = name;
stringToLower(fn);
} }
else else
{ {
if (!audioPath2.empty()) if (!audioPath2.empty())
{ {
fn = audioPath2 + name + fileType; fn = audioPath2 + name + fileType;
stringToLower(fn);
if (!exists(fn)) if (!exists(fn))
{ {
fn = musicPath + name + fileType; fn = musicPath + name + fileType;
stringToLower(fn);
} }
} }
else else
{ {
fn = musicPath + name + fileType; fn = musicPath + name + fileType;
stringToLower(fn);
} }
} }
fn = core->adjustFilenameCase(fn);
lastMusic = name; lastMusic = name;
stringToLower(lastMusic); stringToLower(lastMusic);
@ -1498,14 +1494,8 @@ void loadCacheSoundsCallback (const std::string &filename, intptr_t param)
} }
if (fileType==".ogg") if (fileType==".ogg")
{ {
debugLog("trying to load sound " + filename);
std::string f = filename; sm->loadSoundIntoBank(filename, "", "");
stringToLower(f);
debugLog("trying to load sound " + f);
sm->loadSoundIntoBank(f, "", "");
} }
} }
@ -1525,21 +1515,18 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
// WARNING: local sounds should go here! // WARNING: local sounds should go here!
debugLog(filename); debugLog(filename);
if (slt == SFXLOAD_LOCAL && !audioPath2.empty()) if (slt == SFXLOAD_LOCAL && !audioPath2.empty())
{ {
f = audioPath2 + filename + format; f = core->adjustFilenameCase(audioPath2 + filename + format);
stringToLower(f);
if (!exists(f)) if (!exists(f))
{ {
f = path + filename + format; f = core->adjustFilenameCase(path + filename + format);
stringToLower(f);
} }
} }
else else
{ {
f = path + filename + format; f = core->adjustFilenameCase(path + filename + format);
stringToLower(f);
} }
bool loop = false; bool loop = false;
@ -1561,6 +1548,8 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
return Buffer(); return Buffer();
} }
stringToLower(name);
#ifdef BBGE_BUILD_FMODEX #ifdef BBGE_BUILD_FMODEX
FMOD::Sound * sound = SoundCore::soundMap[name]; FMOD::Sound * sound = SoundCore::soundMap[name];