diff options
| author | Eugene Sandulenko | 2010-09-21 05:36:51 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2010-09-21 05:36:51 +0000 |
| commit | d43ff54a0894c30ea19b10541fd5a7f077892cc9 (patch) | |
| tree | 4be30b0147438938fb0027134138bd11fbf6169b /engines/agi | |
| parent | ec80b95580955fc3eba560c5b89f2aad6bd79a57 (diff) | |
| download | scummvm-rg350-d43ff54a0894c30ea19b10541fd5a7f077892cc9.tar.gz scummvm-rg350-d43ff54a0894c30ea19b10541fd5a7f077892cc9.tar.bz2 scummvm-rg350-d43ff54a0894c30ea19b10541fd5a7f077892cc9.zip | |
AGI: Changed meaning of pcjr sound device. Now it is Sarien emu
Music drivers:
default: proper Tandy/PCJr
adlib: proper Tandy/PCJr
pcjr: old Sarien emu
amiga: old Sarien emu in Amiga mode
pcspk: Sarien emu in PCSpk mode (quite wrong)
midi: 4 channel MIDI
svn-id: r52836
Diffstat (limited to 'engines/agi')
| -rw-r--r-- | engines/agi/agi.cpp | 10 | ||||
| -rw-r--r-- | engines/agi/sound.cpp | 4 |
2 files changed, 10 insertions, 4 deletions
diff --git a/engines/agi/agi.cpp b/engines/agi/agi.cpp index 559e2243bd..508f473609 100644 --- a/engines/agi/agi.cpp +++ b/engines/agi/agi.cpp @@ -578,17 +578,23 @@ void AgiEngine::initialize() { } else if (getPlatform() == Common::kPlatformCoCo3) { _soundemu = SOUND_EMU_COCO3; } else { - switch (MidiDriver::getMusicType(MidiDriver::detectDevice(MDT_PCSPK|MDT_AMIGA|MDT_PCJR|MDT_MIDI))) { + 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_PCJR: + case MT_ADLIB: + // Default sound is the proper PCJr emulation _soundemu = SOUND_EMU_PCJR; break; + case MT_PCJR: + // Under PCJr Sarien emu is disguised + _soundemu = SOUND_EMU_NONE; + break; case MT_AMIGA: _soundemu = SOUND_EMU_AMIGA; break; default: + debug(0, "DEF"); _soundemu = SOUND_EMU_MIDI; break; } diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 5725cf2f84..b215822917 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -173,12 +173,12 @@ SoundMgr::SoundMgr(AgiEngine *agi, Audio::Mixer *pMixer) { _playingSound = -1; switch (_vm->_soundemu) { + case SOUND_EMU_NONE: case SOUND_EMU_AMIGA: case SOUND_EMU_MAC: + case SOUND_EMU_PC: _soundGen = new SoundGenSarien(_vm, pMixer); break; - case SOUND_EMU_NONE: - case SOUND_EMU_PC: case SOUND_EMU_PCJR: _soundGen = new SoundGenPCJr(_vm, pMixer); break; |