diff options
| author | Torbjörn Andersson | 2010-09-21 06:05:27 +0000 |
|---|---|---|
| committer | Torbjörn Andersson | 2010-09-21 06:05:27 +0000 |
| commit | f994deb4eeda51eb3a73e555b69f44e8ee1a6c6a (patch) | |
| tree | 424c96798bfabfafc67fa7c1a325ba784020c67b | |
| parent | d43ff54a0894c30ea19b10541fd5a7f077892cc9 (diff) | |
| download | scummvm-rg350-f994deb4eeda51eb3a73e555b69f44e8ee1a6c6a.tar.gz scummvm-rg350-f994deb4eeda51eb3a73e555b69f44e8ee1a6c6a.tar.bz2 scummvm-rg350-f994deb4eeda51eb3a73e555b69f44e8ee1a6c6a.zip | |
AGI: Deconfusify the AGI music driver
(After a brief discussion with sev.) AdLib is now the old Sarien sound,
PCjr is the new PCjr emulation. PCjr is still the default; we don't
need to ask getMusicType() how to get there.
svn-id: r52838
| -rw-r--r-- | engines/agi/agi.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 508f473609..0646f321d4 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -577,18 +577,19 @@ void AgiEngine::initialize() { _soundemu = SOUND_EMU_APPLE2GS; } else if (getPlatform() == Common::kPlatformCoCo3) { _soundemu = SOUND_EMU_COCO3; + } else if (ConfMan.get("music_driver") == "auto") { + // Default sound is the proper PCJr emulation + _soundemu = SOUND_EMU_PCJR; } else { switch (MidiDriver::getMusicType(MidiDriver::detectDevice(MDT_PCSPK|MDT_AMIGA|MDT_ADLIB|MDT_PCJR|MDT_MIDI))) { case MT_PCSPK: _soundemu = SOUND_EMU_PC; break; case MT_ADLIB: - // Default sound is the proper PCJr emulation - _soundemu = SOUND_EMU_PCJR; + _soundemu = SOUND_EMU_NONE; break; case MT_PCJR: - // Under PCJr Sarien emu is disguised - _soundemu = SOUND_EMU_NONE; + _soundemu = SOUND_EMU_PCJR; break; case MT_AMIGA: _soundemu = SOUND_EMU_AMIGA; |