diff options
| author | Matthew Hoops | 2013-04-20 15:18:09 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2013-04-20 15:18:09 -0400 |
| commit | 72101c66fac7f3d313e8a5702ba61fd5f47acc0b (patch) | |
| tree | ee3ee2b5178b8da69d8e393a6f61b594b163b96b /audio/decoders | |
| parent | c38beb0cedbad38773ffcdd75a382efe1633ed0b (diff) | |
| download | scummvm-rg350-72101c66fac7f3d313e8a5702ba61fd5f47acc0b.tar.gz scummvm-rg350-72101c66fac7f3d313e8a5702ba61fd5f47acc0b.tar.bz2 scummvm-rg350-72101c66fac7f3d313e8a5702ba61fd5f47acc0b.zip | |
AUDIO: Cleanup naming
Diffstat (limited to 'audio/decoders')
| -rw-r--r-- | audio/decoders/adpcm.cpp | 2 | ||||
| -rw-r--r-- | audio/decoders/adpcm.h | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/audio/decoders/adpcm.cpp b/audio/decoders/adpcm.cpp index f069ee3417..61b0abaaca 100644 --- a/audio/decoders/adpcm.cpp +++ b/audio/decoders/adpcm.cpp @@ -433,7 +433,7 @@ int16 Ima_ADPCMStream::decodeIMA(byte code, int channel) { return samp; } -RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, typesADPCM type, int rate, int channels, uint32 blockAlign) { +RewindableAudioStream *makeADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, ADPCMType type, int rate, int channels, uint32 blockAlign) { // If size is 0, report the entire size of the stream if (!size) size = stream->size(); diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h index 288026203b..d3c46574bf 100644 --- a/audio/decoders/adpcm.h +++ b/audio/decoders/adpcm.h @@ -51,7 +51,7 @@ class RewindableAudioStream; // http://wiki.multimedia.cx/index.php?title=Category:ADPCM_Audio_Codecs // Usually, if the audio stream we're trying to play has the FourCC header // string intact, it's easy to discern which encoding is used -enum typesADPCM { +enum ADPCMType { kADPCMOki, // Dialogic/Oki ADPCM (aka VOX) kADPCMMSIma, // Microsoft IMA ADPCM kADPCMMS, // Microsoft ADPCM @@ -76,7 +76,7 @@ enum typesADPCM { RewindableAudioStream *makeADPCMStream( Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, - uint32 size, typesADPCM type, + uint32 size, ADPCMType type, int rate, int channels, uint32 blockAlign = 0); |