[Scummvm-git-logs] scummvm master -> c2bbccd1dbfab02ee851547d48b3069a6c08eb84

[bluegr]

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

Summary:
c2bbccd1db AUDIO: Support using .wav files for extracted Audio CD tracks


Commit: c2bbccd1dbfab02ee851547d48b3069a6c08eb84
    https://github.com/scummvm/scummvm/commit/c2bbccd1dbfab02ee851547d48b3069a6c08eb84
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-09-07T14:35:43+03:00

Commit Message:
AUDIO: Support using .wav files for extracted Audio CD tracks

Changed paths:
    audio/audiostream.cpp
    backends/audiocd/default/default-audiocd.cpp


diff --git a/audio/audiostream.cpp b/audio/audiostream.cpp
index 2feadcab58..9119a91912 100644
--- a/audio/audiostream.cpp
+++ b/audio/audiostream.cpp
@@ -33,6 +33,7 @@
 #include "audio/decoders/quicktime.h"
 #include "audio/decoders/raw.h"
 #include "audio/decoders/vorbis.h"
+#include "audio/decoders/wave.h"
 #include "audio/mixer.h"
 
 
@@ -61,7 +62,8 @@ static const StreamFileFormat STREAM_FILEFORMATS[] = {
 #ifdef USE_MAD
 	{ "MPEG Layer 3", ".mp3",  makeMP3Stream },
 #endif
-	{ "MPEG-4 Audio",   ".m4a",  makeQuickTimeStream },
+	{ "MPEG-4 Audio", ".m4a",  makeQuickTimeStream },
+	{ "WAV",          ".wav",  makeWAVStream },
 };
 
 SeekableAudioStream *SeekableAudioStream::openStreamFile(const Common::String &basename) {
diff --git a/backends/audiocd/default/default-audiocd.cpp b/backends/audiocd/default/default-audiocd.cpp
index 4f466e48c2..e49ad36306 100644
--- a/backends/audiocd/default/default-audiocd.cpp
+++ b/backends/audiocd/default/default-audiocd.cpp
@@ -77,6 +77,7 @@ bool DefaultAudioCDManager::existExtractedCDAudioFiles() {
 		"mp3",
 #endif
 		"m4a",
+		"wav",
 		nullptr
 	};