diff options
| author | Max Horn | 2010-01-19 22:30:33 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-19 22:30:33 +0000 |
| commit | dc5e08e623453aef8bbd92c484dde26d67d91d1e (patch) | |
| tree | 44a32a70bcb683d9d4adb6d9cbd9aa8c641fa7fa /engines/scumm/sound.cpp | |
| parent | 68826c27daabe92782053c17c838ef585cad28c8 (diff) | |
| download | scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.tar.gz scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.tar.bz2 scummvm-rg350-dc5e08e623453aef8bbd92c484dde26d67d91d1e.zip | |
Move raw audio flags from sound/mixer.h to sound/raw.h
svn-id: r47395
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 788be2d0d6..988be35af8 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -164,7 +164,7 @@ void Sound::playSound(int soundID) { Audio::AudioStream *stream; int size = -1; int rate; - byte flags = Audio::Mixer::FLAG_UNSIGNED; + byte flags = Audio::FLAG_UNSIGNED; if (_vm->_game.id == GID_LOOM && _vm->_game.platform == Common::kPlatformPCEngine) { if (soundID >= 13 && soundID <= 32) { @@ -351,7 +351,7 @@ void Sound::playSound(int soundID) { size -= waveSize; if (loopEnd > 0) - flags |= Audio::Mixer::FLAG_LOOP; + flags |= Audio::FLAG_LOOP; stream = Audio::makeRawMemoryStream(sound, waveSize, DisposeAfterUse::YES, rate, flags, loopStart, loopEnd); _mixer->playInputStream(Audio::Mixer::kSFXSoundType, NULL, stream, soundID, 255, 0); @@ -442,7 +442,7 @@ void Sound::playSound(int soundID) { // so maybe this is not really a problem. loopStart = READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8); loopEnd = READ_BE_UINT16(ptr + 14); - flags |= Audio::Mixer::FLAG_LOOP; + flags |= Audio::FLAG_LOOP; } memcpy(sound, ptr + READ_BE_UINT16(ptr + 8), size); @@ -659,7 +659,7 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle #endif break; default: - input = Audio::makeVOCStream(*_sfxFile, Audio::Mixer::FLAG_UNSIGNED); + input = Audio::makeVOCStream(*_sfxFile, Audio::FLAG_UNSIGNED); break; } |