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/scumm | |
| 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/scumm')
| -rw-r--r-- | engines/scumm/he/cup_player_he.cpp | 2 | ||||
| -rw-r--r-- | engines/scumm/he/sound_he.cpp | 4 | ||||
| -rw-r--r-- | engines/scumm/player_mod.cpp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/he/cup_player_he.cpp b/engines/scumm/he/cup_player_he.cpp index a284632fb1..25baa24bde 100644 --- a/engines/scumm/he/cup_player_he.cpp +++ b/engines/scumm/he/cup_player_he.cpp @@ -175,7 +175,7 @@ void CUP_Player::updateSfx() { loopEnd = soundSize - 8; } _mixer->playInputStream(Audio::Mixer::kSFXSoundType, &sfxChannel->handle, - Audio::makeLinearInputStream(soundData + 8, soundSize - 8, 11025, flags, 0, loopEnd)); + Audio::makeRawMemoryStream(soundData + 8, soundSize - 8, 11025, flags, 0, loopEnd)); } } else { warning("Unable to find a free channel to play sound %d", sfx->num); diff --git a/engines/scumm/he/sound_he.cpp b/engines/scumm/he/sound_he.cpp index 8dd59ca388..bd003033c7 100644 --- a/engines/scumm/he/sound_he.cpp +++ b/engines/scumm/he/sound_he.cpp @@ -659,8 +659,8 @@ void SoundHE::playHESound(int soundID, int heOffset, int heChannel, int heFlags) flags |= Audio::Mixer::FLAG_AUTOFREE; - // makeADPCMStream returns a stream in native endianness, but LinearInputStream (and playRaw) - // is defaulted to Big Endian. If we're on a Little Endian system, set the LE flag. + // makeADPCMStream returns a stream in native endianness, but RawMemoryStream (and playRaw) + // defaults to big endian. If we're on a little endian system, set the LE flag. #ifdef SCUMM_LITTLE_ENDIAN flags |= Audio::Mixer::FLAG_LITTLE_ENDIAN; #endif diff --git a/engines/scumm/player_mod.cpp b/engines/scumm/player_mod.cpp index b148818d81..1b18b8f58f 100644 --- a/engines/scumm/player_mod.cpp +++ b/engines/scumm/player_mod.cpp @@ -94,7 +94,7 @@ void Player_MOD::startChannel(int id, void *data, int size, int rate, uint8 vol, _channels[i].pan = pan; _channels[i].freq = rate; _channels[i].ctr = 0; - _channels[i].input = Audio::makeLinearInputStream((const byte*)data, size, rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), loopStart, loopEnd); + _channels[i].input = Audio::makeRawMemoryStream((const byte*)data, size, rate, Audio::Mixer::FLAG_AUTOFREE | (loopStart != loopEnd ? Audio::Mixer::FLAG_LOOP : 0), loopStart, loopEnd); // read the first sample _channels[i].input->readBuffer(&_channels[i].pos, 1); } |