Ticket #8524: kyra-multimidi.diff

engines/kyra/kyra.cpp

@@ -330 +330 @@
                 _system->initSize(320, 200);
         _system->endGFXTransaction();
 
-        // for now we prefer MIDI-to-Adlib conversion over native midi
+        // for now we prefer Adlib over native MIDI
         int midiDriver = MidiDriver::detectMusicDriver(MDT_MIDI | MDT_ADLIB/* | MDT_PREFER_MIDI*/);
 
+        _adlibSound = NULL;
+
         if (midiDriver == MD_ADLIB) {
                 _sound = new SoundAdlibPC(_mixer, this);
                 assert(_sound);
@@ -349 +351 @@
                 _sound = soundMidiPc;
                 assert(_sound);
                 soundMidiPc->hasNativeMT32(native_mt32);
+
+                // Unlike some SCUMM games, it's not that the MIDI sounds are
+                // missing. It's just that at least at the time of writing they
+                // decidedly inferior to the Adlib ones.
+
+                if (ConfMan.getBool("multi_midi")) {
+                        _adlibSound = new SoundAdlibPC(_mixer, this);
+                        assert(_adlibSound);
+                        _adlibSound->setVolume(255);
+                }
         }
         if (!_sound->init()) {
                 error("Couldn't init sound");
@@ -512 +524 @@
         delete _screen;
         delete _res;
         delete _sound;
+        delete _adlibSound;
         delete _saveFileMan;
         delete _seq;
         delete _scriptInterpreter;
@@ -713 +726 @@
                 _handleInput = false;
 
                 _sound->process();
+                if (_adlibSound)
+                        _adlibSound->process();
         }
 }
 

engines/kyra/sound_adlib.cpp

@@ -584 +584 @@
 
 void AdlibDriver::callback() {
         lock();
-        --_flagTrigger;
-        if (_flagTrigger < 0)
-                _flags &= ~8;
-        setupPrograms();
-        executePrograms();
+        if (_soundData) {
+                --_flagTrigger;
+                if (_flagTrigger < 0)
+                        _flags &= ~8;
+                setupPrograms();
+                executePrograms();
 
-        uint8 temp = _unkValue3;
-        _unkValue3 += _tempo;
-        if (_unkValue3 < temp) {
-                if (!(--_unkValue2)) {
-                        _unkValue2 = _unkValue1;
-                        ++_unkValue4;
+                uint8 temp = _unkValue3;
+                _unkValue3 += _tempo;
+                if (_unkValue3 < temp) {
+                        if (!(--_unkValue2)) {
+                                _unkValue2 = _unkValue1;
+                                ++_unkValue4;
+                        }
                 }
         }
         unlock();

engines/kyra/seqplayer.cpp

@@ -375 +375 @@
 void SeqPlayer::s1_playEffect() {
         uint8 track = *_seqData++;
         _vm->delay(3 * _vm->tickLength());
-        _sound->playSoundEffect(track);
+        _vm->snd_playSoundEffect(track);
 }
 
 void SeqPlayer::s1_playTrack() {

engines/kyra/kyra.h

@@ -256 +256 @@
         ScreenAnimator *animator() { return _animator; }
         TextDisplayer *text() { return _text; }
         Sound *sound() { return _sound; }
+        Sound *adlibSound() { return _adlibSound; }
         StaticResource *staticres() { return _staticres; }
         uint32 tickLength() const { return _tickLength; }
         Movie *createWSAMovie();
@@ -791 +792 @@
         Screen *_screen;
         ScreenAnimator *_animator;
         Sound *_sound;
+        Sound *_adlibSound;
         SeqPlayer *_seq;
         Sprites *_sprites;
         TextDisplayer *_text;

engines/kyra/sound.cpp

@@ -402 +402 @@
         _curMusicTheme = _newMusicTheme = file;
         _sound->loadMusicFile(_musicFiles[file]);
         _sound->playTrack(track);
+        if (_adlibSound)
+                _adlibSound->loadMusicFile(_musicFiles[file]);
 }
 
 void KyraEngine::snd_playSoundEffect(int track) {
         debugC(9, kDebugLevelMain | kDebugLevelSound, "KyraEngine::snd_playSoundEffect(%d)", track);
-        _sound->playSoundEffect(track);
+        if (_adlibSound)
+                _adlibSound->playSoundEffect(track);
+        else
+                _sound->playSoundEffect(track);
 }
 
 void KyraEngine::snd_playWanderScoreViaMap(int command, int restart) {