aboutsummaryrefslogtreecommitdiff
path: root/engines/lastexpress
diff options
context:
space:
mode:
authorLittleboy2011-07-08 21:28:49 -0400
committerLittleboy2011-07-08 22:03:28 -0400
commit63e2fe7e7bc54f93cf47a5c85d6ca621d332a94a (patch)
treebf221d95e63fa14ae22b1f190332c9c4c7cf0773 /engines/lastexpress
parent831d358d425b8d0e2725df87054fd321e6e8dd3b (diff)
downloadscummvm-rg350-63e2fe7e7bc54f93cf47a5c85d6ca621d332a94a.tar.gz
scummvm-rg350-63e2fe7e7bc54f93cf47a5c85d6ca621d332a94a.tar.bz2
scummvm-rg350-63e2fe7e7bc54f93cf47a5c85d6ca621d332a94a.zip
LASTEXPRESS: Have LastExpress_ADPCMStream inherit directly from Audio::ADPCMStream (as suggested by clone2727)
Diffstat (limited to 'engines/lastexpress')
-rw-r--r--engines/lastexpress/data/snd.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/lastexpress/data/snd.cpp b/engines/lastexpress/data/snd.cpp
index 9e92ded204..6845be8808 100644
--- a/engines/lastexpress/data/snd.cpp
+++ b/engines/lastexpress/data/snd.cpp
@@ -352,10 +352,10 @@ static const int p2s[17] = { 0, 1, 1, 3, 1, 5, 3, 7, 1, 9, 5, 11, 3, 13, 7, 15,
// Last Express ADPCM is similar to MS IMA mono, but inverts its nibbles
// and does not have the 4 byte per channel requirement
-class LastExpress_ADPCMStream : public Audio::Ima_ADPCMStream {
+class LastExpress_ADPCMStream : public Audio::ADPCMStream {
public:
LastExpress_ADPCMStream(Common::SeekableReadStream *stream, DisposeAfterUse::Flag disposeAfterUse, uint32 size, uint32 blockSize, int32 filterId) :
- Audio::Ima_ADPCMStream(stream, disposeAfterUse, size, 44100, 1, blockSize) {
+ Audio::ADPCMStream(stream, disposeAfterUse, size, 44100, 1, blockSize) {
_currentFilterId = -1;
_nextFilterId = filterId;
}