diff options
| author | Max Horn | 2010-01-23 23:55:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-23 23:55:35 +0000 |
| commit | 4b996e7de7d25a650f1ae73722af827fcab7b4d6 (patch) | |
| tree | ea6e7a352a7adaf3e04fbb64716ed8c04c85ea1b /engines/mohawk | |
| parent | 9369c9f3c518d394b50b04afcf91e7cc5f2f39be (diff) | |
| download | scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.gz scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.tar.bz2 scummvm-rg350-4b996e7de7d25a650f1ae73722af827fcab7b4d6.zip | |
Reorder params to Audio::makeRawMemoryStream
svn-id: r47492
Diffstat (limited to 'engines/mohawk')
| -rw-r--r-- | engines/mohawk/sound.cpp | 4 | ||||
| -rw-r--r-- | engines/mohawk/video/qt_player.cpp | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/mohawk/sound.cpp b/engines/mohawk/sound.cpp index c2954358fd..97e4b91386 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -454,7 +454,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre if (data_chunk.channels == 2) flags |= Audio::FLAG_STEREO; - return Audio::makeRawMemoryStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES, data_chunk.sample_rate, flags); + return Audio::makeRawMemoryStream(data_chunk.audio_data, data_chunk.size, data_chunk.sample_rate, flags); } else if (data_chunk.encoding == kCodecADPCM) { Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES); uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8; @@ -494,7 +494,7 @@ Audio::AudioStream *Sound::makeOldMohawkWaveStream(Common::SeekableReadStream *s stream->read(data, size); delete stream; - return Audio::makeRawMemoryStream(data, size, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED); + return Audio::makeRawMemoryStream(data, size, rate, Audio::FLAG_UNSIGNED); } SndHandle *Sound::getHandle() { diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index f62968d383..b35f43ca2d 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/engines/mohawk/video/qt_player.cpp @@ -1170,7 +1170,7 @@ Audio::AudioStream *QTPlayer::createAudioStream(Common::SeekableReadStream *stre byte *data = (byte *)malloc(dataSize); stream->read(data, dataSize); delete stream; - return Audio::makeRawMemoryStream(data, dataSize, DisposeAfterUse::YES, _streams[_audioStreamIndex]->sample_rate, flags); + return Audio::makeRawMemoryStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags); } else if (_streams[_audioStreamIndex]->codec_tag == MKID_BE('ima4')) { // Riven uses this codec (as do some Myst ME videos) return Audio::makeADPCMStream(stream, true, stream->size(), Audio::kADPCMApple, _streams[_audioStreamIndex]->sample_rate, _streams[_audioStreamIndex]->channels, 34); |