diff options
| author | Max Horn | 2010-01-19 00:52:41 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-19 00:52:41 +0000 |
| commit | 349fcd1d715091c1b1816ff610910531d5dd8544 (patch) | |
| tree | 3f29ede9510a88d5ce521466c22f63481b4c3d5a /engines/mohawk | |
| parent | 8ff407e80aac35f1fc62a74881bc123aa3c93d07 (diff) | |
| download | scummvm-rg350-349fcd1d715091c1b1816ff610910531d5dd8544.tar.gz scummvm-rg350-349fcd1d715091c1b1816ff610910531d5dd8544.tar.bz2 scummvm-rg350-349fcd1d715091c1b1816ff610910531d5dd8544.zip | |
Rename 'Linear' audio streams to 'raw'
svn-id: r47367
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 fd37bbdfee..db40555dc9 100644 --- a/engines/mohawk/sound.cpp +++ b/engines/mohawk/sound.cpp @@ -439,7 +439,7 @@ Audio::AudioStream *Sound::makeMohawkWaveStream(Common::SeekableReadStream *stre flags |= Audio::Mixer::FLAG_STEREO; if (data_chunk.loop == 0xFFFF || loop) 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); + return Audio::makeRawMemoryStream(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, DisposeAfterUse::YES); uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8; @@ -485,7 +485,7 @@ Audio::AudioStream *Sound::makeOldMohawkWaveStream(Common::SeekableReadStream *s if (loop) flags |= Audio::Mixer::FLAG_LOOP; - return Audio::makeLinearInputStream(data, size, rate, flags, 0, 0); + return Audio::makeRawMemoryStream(data, size, rate, flags, 0, 0); } SndHandle *Sound::getHandle() { diff --git a/engines/mohawk/video/qt_player.cpp b/engines/mohawk/video/qt_player.cpp index 9f95e20c8e..2cb1ed364c 100644 --- a/engines/mohawk/video/qt_player.cpp +++ b/engines/mohawk/video/qt_player.cpp @@ -1169,7 +1169,7 @@ Audio::AudioStream *QTPlayer::createAudioStream(Common::SeekableReadStream *stre byte *data = (byte *)malloc(dataSize); stream->read(data, dataSize); delete stream; - return Audio::makeLinearInputStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags, 0, 0); + return Audio::makeRawMemoryStream(data, dataSize, _streams[_audioStreamIndex]->sample_rate, flags, 0, 0); } 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); |