diff options
| -rw-r--r-- | engines/kyra/sound_amiga.cpp | 20 | ||||
| -rw-r--r-- | engines/kyra/sound_intern.h | 1 | ||||
| -rw-r--r-- | sound/mods/maxtrax.cpp | 2 |
3 files changed, 12 insertions, 11 deletions
diff --git a/engines/kyra/sound_amiga.cpp b/engines/kyra/sound_amiga.cpp index e858ca3df2..3de560a207 100644 --- a/engines/kyra/sound_amiga.cpp +++ b/engines/kyra/sound_amiga.cpp @@ -40,8 +40,8 @@ const char *const SoundAmiga::kFilenameTable[3][2] = { { "finalescr.mx", 0 } }; -SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer) : - Sound(vm, mixer), _driver(0), _fileLoaded(kFileNone) { +SoundAmiga::SoundAmiga(KyraEngine_v1 *vm, Audio::Mixer *mixer) + : Sound(vm, mixer), _driver(0), _musicHandle(), _fileLoaded(kFileNone) { } SoundAmiga::~SoundAmiga() { @@ -96,8 +96,8 @@ void SoundAmiga::playTrack(uint8 track) { if (_driver->playSong(track)) { _driver->setVolume(0x40); _driver->setTempo(tempoIntro[track] << 4); - if (!_mixer->isSoundHandleActive(_soundChannels[0])) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundChannels[0], _driver); + if (!_mixer->isSoundHandleActive(_musicHandle)) + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); } } else if (track == 0){ _driver->stopMusic(); @@ -113,8 +113,8 @@ void SoundAmiga::playTrack(uint8 track) { _driver->setVolume(0x40); _driver->setTempo(tempoIngame[track] << 4); - if (!_mixer->isSoundHandleActive(_soundChannels[0])) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundChannels[0], _driver); + if (!_mixer->isSoundHandleActive(_musicHandle)) + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); } } else if (track == 0){ _driver->stopMusic(); @@ -146,8 +146,8 @@ void SoundAmiga::playSoundEffect(uint8 track) { assert(track < ARRAYSIZE(tableEffectsIntro)); const EffectEntry &entry = tableEffectsIntro[track]; bool success = _driver->playNote(entry.note, entry.patch, entry.duration, entry.volume, entry.pan != 0) >= 0; - if (!_mixer->isSoundHandleActive(_soundChannels[0])) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundChannels[0], _driver); + if (!_mixer->isSoundHandleActive(_musicHandle)) + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); // ingame @@ -162,8 +162,8 @@ void SoundAmiga::playSoundEffect(uint8 track) { if (extVar2 && entry.note) { byte pan = (entry.pan == 2) ? 0 : entry.pan; _driver->playNote(entry.note, entry.patch, entry.duration, entry.volume, pan != 0); - if (!_mixer->isSoundHandleActive(_soundChannels[0])) - _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundChannels[0], _driver); + if (!_mixer->isSoundHandleActive(_musicHandle)) + _mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_musicHandle, _driver, -1, Audio::Mixer::kMaxChannelVolume, 0, false); } } } diff --git a/engines/kyra/sound_intern.h b/engines/kyra/sound_intern.h index 982d370bf8..997a99b769 100644 --- a/engines/kyra/sound_intern.h +++ b/engines/kyra/sound_intern.h @@ -307,6 +307,7 @@ public: protected: Audio::MaxTrax *_driver; + Audio::SoundHandle _musicHandle; enum FileType { kFileNone = -1, kFileIntro = 0, kFileGame = 1, kFileFinal = 2 } _fileLoaded; static const char *const kFilenameTable[3][2]; diff --git a/sound/mods/maxtrax.cpp b/sound/mods/maxtrax.cpp index b09e2ea732..6b1701d63e 100644 --- a/sound/mods/maxtrax.cpp +++ b/sound/mods/maxtrax.cpp @@ -339,7 +339,7 @@ bool MaxTrax::playSong(int songIndex, bool loop, int advance) { // Songs are special markers in the score for (; advance > 0; --advance) { // TODO - check for boundaries - for(; cev->command != 0xFF && (cev->command != 0xA0 || (cev->stopTime >> 8) != 0x00); ++cev) + for (; cev->command != 0xFF && (cev->command != 0xA0 || (cev->stopTime >> 8) != 0x00); ++cev) ; // no end_command or special_command + end } _playerCtx.nextEvent = cev; |