[Scummvm-cvs-logs] scummvm master -> 7af4a1a05f5a36937413027996bd8d239b7eeadc

[somaen]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
0cfd058943 WINTERMUTE: Correctly find .ogg version of .wav files
7af4a1a05f Merge pull request #728 from tobiatesan/fix_ogg


Commit: 0cfd0589432798838b66023b01a5ca6ba4fad0ca
    https://github.com/scummvm/scummvm/commit/0cfd0589432798838b66023b01a5ca6ba4fad0ca
Author: Tobia Tesan (tobia.tesan at gmail.com)
Date: 2016-03-30T18:35:05+02:00

Commit Message:
WINTERMUTE: Correctly find .ogg version of .wav files

As it was, it didn't reliably work across platforms because it turned
some\\windows\\path.wav
into
some/system/pathogg

Note no "." before "ogg"; also since we use the new filename
to search for the file inside DCPs, which use Windows naming,
we don't want system-specific path format.

Fixes #7088

Changed paths:
    engines/wintermute/base/sound/base_sound_manager.cpp



diff --git a/engines/wintermute/base/sound/base_sound_manager.cpp b/engines/wintermute/base/sound/base_sound_manager.cpp
index f1e0c3b..74c0086 100644
--- a/engines/wintermute/base/sound/base_sound_manager.cpp
+++ b/engines/wintermute/base/sound/base_sound_manager.cpp
@@ -100,15 +100,14 @@ BaseSoundBuffer *BaseSoundMgr::addSound(const Common::String &filename, Audio::M
 	BaseSoundBuffer *sound;
 
 	Common::String useFilename = filename;
+	useFilename.toLowercase();
 	// try to switch WAV to OGG file (if available)
-	AnsiString ext = PathUtil::getExtension(filename);
-	if (StringUtil::compareNoCase(ext, "wav")) {
-		AnsiString path = PathUtil::getDirectoryName(filename);
-		AnsiString name = PathUtil::getFileNameWithoutExtension(filename);
-
-		AnsiString newFile = PathUtil::combine(path, name + "ogg");
-		if (BaseFileManager::getEngineInstance()->hasFile(newFile)) {
-			useFilename = newFile;
+	if (useFilename.hasSuffix(".wav")) {
+		Common::String oggFilename = useFilename;
+		oggFilename.erase(oggFilename.size() - 4);
+		oggFilename = oggFilename + ".ogg";
+		if (BaseFileManager::getEngineInstance()->hasFile(oggFilename)) {
+			useFilename = oggFilename;
 		}
 	}
 


Commit: 7af4a1a05f5a36937413027996bd8d239b7eeadc
    https://github.com/scummvm/scummvm/commit/7af4a1a05f5a36937413027996bd8d239b7eeadc
Author: Einar Johan Trøan Sømåen (einarjohants at gmail.com)
Date: 2016-04-23T11:42:33+02:00

Commit Message:
Merge pull request #728 from tobiatesan/fix_ogg

WINTERMUTE: Correctly find .ogg version of .wav files

Changed paths:
    engines/wintermute/base/sound/base_sound_manager.cpp