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/sky/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/sky/sound.cpp')
-rw-r--r-- | engines/sky/sound.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/sky/sound.cpp b/engines/sky/sound.cpp index 83ddc11a6b..1b7fd8fa50 100644 --- a/engines/sky/sound.cpp +++ b/engines/sky/sound.cpp @@ -1038,7 +1038,7 @@ Sound::~Sound() { void Sound::playSound(uint32 id, byte *sound, uint32 size, Audio::SoundHandle *handle) { byte flags = 0; - flags |= Audio::Mixer::FLAG_UNSIGNED; + flags |= Audio::FLAG_UNSIGNED; size -= sizeof(DataFileHeader); byte *buffer = (byte *)malloc(size); memcpy(buffer, sound+sizeof(DataFileHeader), size); @@ -1111,13 +1111,13 @@ void Sound::playSound(uint16 sound, uint16 volume, uint8 channel) { uint32 dataLoop = READ_BE_UINT16(_sfxInfo + (sound << 3) + 6); dataOfs += _sfxBaseOfs; - byte flags = Audio::Mixer::FLAG_UNSIGNED; + byte flags = Audio::FLAG_UNSIGNED; uint32 loopSta = 0, loopEnd = 0; if (dataLoop) { loopSta = dataSize - dataLoop; loopEnd = dataSize; - flags |= Audio::Mixer::FLAG_LOOP; + flags |= Audio::FLAG_LOOP; } @@ -1249,7 +1249,7 @@ bool Sound::startSpeech(uint16 textNum) { _mixer->stopID(SOUND_SPEECH); - Audio::AudioStream *stream = Audio::makeRawMemoryStream(playBuffer, speechSize, DisposeAfterUse::YES, rate, Audio::Mixer::FLAG_UNSIGNED); + Audio::AudioStream *stream = Audio::makeRawMemoryStream(playBuffer, speechSize, DisposeAfterUse::YES, rate, Audio::FLAG_UNSIGNED); _mixer->playInputStream(Audio::Mixer::kSpeechSoundType, &_ingameSpeech, stream, SOUND_SPEECH); return true; } |