diff options
Diffstat (limited to 'engines/mohawk')
| -rw-r--r-- | engines/mohawk/bitmap.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/livingbooks.cpp | 2 | ||||
| -rw-r--r-- | engines/mohawk/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/video/qt_player.cpp | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/engines/mohawk/bitmap.cpp b/engines/mohawk/bitmap.cpp index 287b481d4c..cdf7c73d4c 100644 --- a/engines/mohawk/bitmap.cpp +++ b/engines/mohawk/bitmap.cpp @@ -247,7 +247,7 @@ Common::SeekableReadStream *MohawkBitmap::decompressLZ(Common::SeekableReadStrea } } - return new Common::MemoryReadStream(outputData, uncompressedSize, Common::DisposeAfterUse::YES); + return new Common::MemoryReadStream(outputData, uncompressedSize, DisposeAfterUse::YES); } void MohawkBitmap::unpackLZ() { @@ -316,7 +316,7 @@ void MohawkBitmap::unpackRiven() { } delete _data; - _data = new Common::MemoryReadStream(uncompressedData, _header.bytesPerRow * _header.height, Common::DisposeAfterUse::YES); + _data = new Common::MemoryReadStream(uncompressedData, _header.bytesPerRow * _header.height, DisposeAfterUse::YES); } static byte getLastTwoBits(byte c) { diff --git a/engines/mohawk/livingbooks.cpp b/engines/mohawk/livingbooks.cpp index 88b3998af7..a24372826f 100644 --- a/engines/mohawk/livingbooks.cpp +++ b/engines/mohawk/livingbooks.cpp @@ -263,7 +263,7 @@ void MohawkEngine_LivingBooks::loadANI(uint16 resourceId) { Common::SeekableSubReadStreamEndian *MohawkEngine_LivingBooks::wrapStreamEndian(uint32 tag, uint16 id) { Common::SeekableReadStream *dataStream = getRawData(tag, id); - return new Common::SeekableSubReadStreamEndian(dataStream, 0, dataStream->size(), isBigEndian(), Common::DisposeAfterUse::YES); + return new Common::SeekableSubReadStreamEndian(dataStream, 0, dataStream->size(), isBigEndian(), DisposeAfterUse::YES); } Common::String MohawkEngine_LivingBooks::getStringFromConfig(Common::String section, Common::String key) { diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index b3a7f8fc21..1864cdd006 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -441,13 +441,13 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre flags |= Audio::Mixer::FLAG_LOOP; return Audio::makeLinearInputStream(data_chunk.audio_data, data_chunk.size, data_chunk.sample_rate, flags, data_chunk.loopStart, data_chunk.loopEnd); } else if (data_chunk.encoding == kCodecADPCM) { - Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, Common::DisposeAfterUse::YES); + Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES); uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8; return makeLoopingAudioStream(Audio::makeADPCMStream(dataStream, true, data_chunk.size, Audio::kADPCMIma, data_chunk.sample_rate, data_chunk.channels, blockAlign), loop ? 0 : 1); } else if (data_chunk.encoding == kCodecMPEG2) { #ifdef USE_MAD - Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, Common::DisposeAfterUse::YES); + Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES); return Audio::makeLoopingAudioStream(Audio::makeMP3Stream(dataStream, true), loop ? 0 : 1); #else warning ("MAD library not included - unable to play MP2 audio"); diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index 2f4c54abc4..9f95e20c8e 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/engines/mohawk/video/qt_player.cpp @@ -467,7 +467,7 @@ int QTPlayer::readCMOV(MOVatom atom) { // Load data into a new MemoryReadStream and assign _fd to be that Common::SeekableReadStream *oldStream = _fd; - _fd = new Common::MemoryReadStream(uncompressedData, uncompressedSize, Common::DisposeAfterUse::YES); + _fd = new Common::MemoryReadStream(uncompressedData, uncompressedSize, DisposeAfterUse::YES); // Read the contents of the uncompressed data MOVatom a = { MKID_BE('moov'), 0, uncompressedSize }; @@ -1224,7 +1224,7 @@ void QTPlayer::updateAudioBuffer() { } // Now queue the buffer - _audStream->queueAudioStream(createAudioStream(new Common::MemoryReadStream(wStream->getData(), wStream->size(), Common::DisposeAfterUse::YES))); + _audStream->queueAudioStream(createAudioStream(new Common::MemoryReadStream(wStream->getData(), wStream->size(), DisposeAfterUse::YES))); delete wStream; } } |