diff options
Diffstat (limited to 'engines/lab')
| -rw-r--r-- | engines/lab/audioi.cpp | 4 | ||||
| -rw-r--r-- | engines/lab/labfun.h | 2 | ||||
| -rw-r--r-- | engines/lab/readdiff.cpp | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/engines/lab/audioi.cpp b/engines/lab/audioi.cpp index 5b2d183155..735f9b67f1 100644 --- a/engines/lab/audioi.cpp +++ b/engines/lab/audioi.cpp @@ -177,7 +177,7 @@ void flushAudio() { -void playMusic(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, void *Data) { +void playSoundEffect(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, void *Data) { if (!DoMusic) return; @@ -204,7 +204,7 @@ void playMusic(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, voi soundFlags |= Audio::FLAG_16BITS; Audio::SeekableAudioStream *audStream = Audio::makeRawStream((const byte *)Data, Length, SampleSpeed, soundFlags, DisposeAfterUse::NO); - g_lab->_mixer->playStream(Audio::Mixer::kMusicSoundType, &g_musicHandle, audStream); + g_lab->_mixer->playStream(Audio::Mixer::kSFXSoundType, &g_musicHandle, audStream); updateSoundBuffers(); } diff --git a/engines/lab/labfun.h b/engines/lab/labfun.h index a527b12cb3..cc77a4c3f2 100644 --- a/engines/lab/labfun.h +++ b/engines/lab/labfun.h @@ -73,7 +73,7 @@ void updateSoundBuffers(); void flushAudio(); -void playMusic(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, void *Data); +void playSoundEffect(uint16 SampleSpeed, uint16 Volume, uint32 Length, bool flush, void *Data); diff --git a/engines/lab/readdiff.cpp b/engines/lab/readdiff.cpp index b75ed6d7e9..66bfa80274 100644 --- a/engines/lab/readdiff.cpp +++ b/engines/lab/readdiff.cpp @@ -291,7 +291,7 @@ void diffNextFrame() { uint32 musicsize = size; skip(difffile, size); - playMusic(samplespeed, 64, musicsize, true, music); + playSoundEffect(samplespeed, 64, musicsize, true, music); break; } case 65535L: @@ -563,7 +563,7 @@ void readSound() { uint32 musicsize = size_; skip(difffile_, size_); - playMusic(samplespeed_, 64, musicsize, true, music); + playSoundEffect(samplespeed_, 64, musicsize, true, music); } else if (header_ == 65535L) { if (mwaiteffect) { while (EffectPlaying) { |