Archive/openmw
0
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-04-30 13:57:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions 29

Merge commit 'upstream/master'

Browse source
This commit is contained in:
Marc Zinnschlag 2010-08-20 14:23:18 +02:00
commit 13409b546f
2 changed files with 30 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

24
apps/openmw/mwsound/soundmanager.cpp
View file

@ -104,17 +104,37 @@ namespace MWSound
root->addFrameListener(&updater);
}
std::string toMp3(const std::string &str)
{
std::string wav = str;
int i = str.size()-3;
wav[i++] = 'm';
wav[i++] = 'p';
wav[i++] = '3';
return wav;
}
bool hasFile(const std::string &str)
{
return files.has(str);
if(files.has(str)) return true;
// Not found? Try exchanging .wav with .mp3
return files.has(toMp3(str));
}
// Convert a Morrowind sound path (eg. Fx\funny.wav) to full path
// with proper slash conversion (eg. datadir/Sound/Fx/funny.wav)
std::string convertPath(const std::string &str)
{
if(hasFile(str))
// Search and return
if(files.has(str))
return files.lookup(str);
// Try mp3 if the wav wasn't found
std::string mp3 = toMp3(str);
if(files.has(mp3))
return files.lookup(mp3);
// Give up
return "";
}