thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

TITANIC: Use WaveFormat enum

Browse source
This commit is contained in:
SupSuper 2021-02-05 14:28:51 +00:00 • committed by Filippos Karapetis
parent 872a547230
commit 1b2e0b7465
1 changed files with 2 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

5
engines/titanic/sound/wave_file.cpp
View file

@ -22,6 +22,7 @@
#include "audio/decoders/raw.h" #include "audio/decoders/raw.h"
#include "audio/decoders/wave.h" #include "audio/decoders/wave.h"
#include "audio/decoders/wave_types.h"
#include "common/memstream.h" #include "common/memstream.h"
#include "titanic/sound/wave_file.h" #include "titanic/sound/wave_file.h"
#include "titanic/sound/sound_manager.h" #include "titanic/sound/sound_manager.h"
@ -176,14 +177,12 @@ Audio::SeekableAudioStream *CWaveFile::createAudioStream() {
const int16 *CWaveFile::lock() { const int16 *CWaveFile::lock() {
enum { kWaveFormatPCM = 1 };
switch (_loadMode) { switch (_loadMode) {
case LOADMODE_SCUMMVM: case LOADMODE_SCUMMVM:
// Sanity checking that only raw 16-bit LE 22Khz waves can be locked // Sanity checking that only raw 16-bit LE 22Khz waves can be locked
assert(_waveData && _rate == AUDIO_SAMPLING_RATE); assert(_waveData && _rate == AUDIO_SAMPLING_RATE);
assert(_flags == (Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_16BITS)); assert(_flags == (Audio::FLAG_LITTLE_ENDIAN | Audio::FLAG_16BITS));
assert(_wavType == kWaveFormatPCM); assert(_wavType == Audio::kWaveFormatPCM);
// Return a pointer to the data section of the wave file // Return a pointer to the data section of the wave file
return (const int16 *)(_waveData + _headerSize); return (const int16 *)(_waveData + _headerSize);