aboutsummaryrefslogtreecommitdiff
path: root/engines/tony/sound.cpp
diff options
context:
space:
mode:
authorStrangerke2015-12-31 14:41:18 +0100
committerStrangerke2015-12-31 14:41:18 +0100
commit7ee36a97ee8c43b28c5dd4d8a0d3211698d1dc7f (patch)
tree2538eda2f60cb6461357dfd455040603abbf1baf /engines/tony/sound.cpp
parente5189bad6790c8101e7287b5c2ae39add6c8e673 (diff)
downloadscummvm-rg350-7ee36a97ee8c43b28c5dd4d8a0d3211698d1dc7f.tar.gz
scummvm-rg350-7ee36a97ee8c43b28c5dd4d8a0d3211698d1dc7f.tar.bz2
scummvm-rg350-7ee36a97ee8c43b28c5dd4d8a0d3211698d1dc7f.zip
TONY: As codec is always ADPCM, remove some dead code
Diffstat (limited to 'engines/tony/sound.cpp')
-rw-r--r--engines/tony/sound.cpp16
1 files changed, 2 insertions, 14 deletions
diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 2a4eb826f3..fe4e0ab0e7 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -219,11 +219,10 @@ bool FPSfx::loadVoiceFromVDB(Common::File &vdbFP) {
* Opens a file and loads a sound effect.
*
* @param fileName Sfx filename
- * @param codec CODEC used to uncompress the samples
*
* @returns True is everything is OK, False otherwise
*/
-bool FPSfx::loadFile(const char *fileName, uint32 codec) {
+bool FPSfx::loadFile(const char *fileName) {
if (!_soundSupported)
return true;
@@ -242,18 +241,7 @@ bool FPSfx::loadFile(const char *fileName, uint32 codec) {
uint32 channels = file.readUint32LE();
Common::SeekableReadStream *buffer = file.readStream(file.size() - file.pos());
-
- if (codec == FPCODEC_ADPCM) {
- _rewindableStream = Audio::makeADPCMStream(buffer, DisposeAfterUse::YES, 0, Audio::kADPCMDVI, rate, channels);
- } else {
- byte flags = Audio::FLAG_16BITS | Audio::FLAG_LITTLE_ENDIAN;
-
- if (channels == 2)
- flags |= Audio::FLAG_STEREO;
-
- _rewindableStream = Audio::makeRawStream(buffer, rate, flags, DisposeAfterUse::YES);
- }
-
+ _rewindableStream = Audio::makeADPCMStream(buffer, DisposeAfterUse::YES, 0, Audio::kADPCMDVI, rate, channels);
_fileLoaded = true;
return true;
}