diff options
| author | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
|---|---|---|
| committer | Matthew Hoops | 2011-04-13 16:04:29 -0400 |
| commit | 6d153f311c65fe414e31e99f8a9a6503c49a01a5 (patch) | |
| tree | 9173f9964c0fec4215514e622f705810730d0ce9 /audio/decoders/adpcm.h | |
| parent | 47c2a9adbe8d9e6640a819386f0f34e929937672 (diff) | |
| parent | 66b43f2312578f35e0718d0699de207a7bf77f1a (diff) | |
| download | scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.gz scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.tar.bz2 scummvm-rg350-6d153f311c65fe414e31e99f8a9a6503c49a01a5.zip | |
Merge remote branch 'upstream/master' into t7g-ios
Conflicts:
video/qt_decoder.cpp
Diffstat (limited to 'audio/decoders/adpcm.h')
| -rw-r--r-- | audio/decoders/adpcm.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/audio/decoders/adpcm.h b/audio/decoders/adpcm.h index 38ec870a27..7202d6bc9c 100644 --- a/audio/decoders/adpcm.h +++ b/audio/decoders/adpcm.h @@ -38,7 +38,9 @@ #define SOUND_ADPCM_H #include "common/scummsys.h" -#include "common/stream.h" +#include "common/types.h" + +namespace Common { class SeekableReadStream; } namespace Audio { @@ -56,10 +58,7 @@ enum typesADPCM { kADPCMMSIma, // Microsoft IMA ADPCM kADPCMMSImaLastExpress, // Microsoft IMA ADPCM (with inverted samples) kADPCMMS, // Microsoft ADPCM - kADPCMTinsel4, // 4-bit ADPCM used by the Tinsel engine - kADPCMTinsel6, // 6-bit ADPCM used by the Tinsel engine - kADPCMTinsel8, // 8-bit ADPCM used by the Tinsel engine - kADPCMIma, // Standard IMA ADPCM + kADPCMDVI, // Intel DVI IMA ADPCM kADPCMApple, // Apple QuickTime IMA ADPCM kADPCMDK3 // Duck DK3 IMA ADPCM }; |