From 5b7757530f5d333456e510f5be88997b85ed9a8a Mon Sep 17 00:00:00 2001
From: fgenesis <false.genesis@googlemail.com>
Date: Thu, 14 Jun 2012 19:06:06 +0200
Subject: [PATCH] More linux file name case issues...

---
 BBGE/SoundManager.cpp | 35 ++++++++++++-----------------------
 1 file changed, 12 insertions(+), 23 deletions(-)

diff --git a/BBGE/SoundManager.cpp b/BBGE/SoundManager.cpp
index f6fdc50..b5a5ae8 100644
--- a/BBGE/SoundManager.cpp
+++ b/BBGE/SoundManager.cpp
@@ -925,15 +925,13 @@ bool SoundManager::playVoice(const std::string &name, SoundVoiceType svt, float
 	
 	if (!voicePath2.empty())
 	{
-		fn = voicePath2 + name + fileType;
-		stringToLower(fn);
+		fn = core->adjustFilenameCase(voicePath2 + name + fileType);
 		if (exists(fn))	checkOther = false;
 	}
 
 	if (checkOther)
 	{
-		fn = voicePath + name + fileType;
-		stringToLower(fn);
+		fn = core->adjustFilenameCase(voicePath + name + fileType);
 		if (!exists(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] == '.')
 	{
 		fn = name;
-		stringToLower(fn);
 	}
 	else
 	{
 		if (!audioPath2.empty())
 		{
 			fn = audioPath2 + name + fileType;
-			stringToLower(fn);
 			if (!exists(fn))
 			{
 				fn = musicPath + name + fileType;
-				stringToLower(fn);
 			}
 		}
 		else
 		{
 			fn = musicPath + name + fileType;
-			stringToLower(fn);
 		}
 	}
 
+	fn = core->adjustFilenameCase(fn);
+
 	lastMusic = name;
 	stringToLower(lastMusic);
 
@@ -1498,14 +1494,8 @@ void loadCacheSoundsCallback (const std::string &filename, intptr_t param)
 	}
 	if (fileType==".ogg")
 	{
-
-		std::string f = filename;
-		stringToLower(f);
-
-		debugLog("trying to load sound " + f);
-
-		sm->loadSoundIntoBank(f, "", "");
-
+		debugLog("trying to load sound " + filename);
+		sm->loadSoundIntoBank(filename, "", "");
 	}
 }
 
@@ -1525,21 +1515,18 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
 
 	// WARNING: local sounds should go here!
 
-    debugLog(filename);
+	debugLog(filename);
 	if (slt == SFXLOAD_LOCAL && !audioPath2.empty())
 	{
-		f = audioPath2 + filename + format;
-		stringToLower(f);
+		f = core->adjustFilenameCase(audioPath2 + filename + format);
 		if (!exists(f))
 		{
-			f = path + filename + format;
-			stringToLower(f);
+			f = core->adjustFilenameCase(path + filename + format);
 		}
 	}
 	else
 	{
-		f = path + filename + format;
-		stringToLower(f);
+		f = core->adjustFilenameCase(path + filename + format);
 	}
 
 	bool loop = false;
@@ -1561,6 +1548,8 @@ Buffer SoundManager::loadSoundIntoBank(const std::string &filename, const std::s
 		return Buffer();
 	}
 
+	stringToLower(name);
+
 #ifdef BBGE_BUILD_FMODEX
 
 	FMOD::Sound * sound = SoundCore::soundMap[name];