libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-13 12:39:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AGI: Changed meaning of pcjr sound device. Now it is Sarien emu

Browse Source 
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
This commit is contained in:
Eugene Sandulenko 2010-09-21 05:36:51 +00:00
parent ec80b95580
commit d43ff54a08
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
engines/agi/agi.cpp
View File

@ -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;
}

4
engines/agi/sound.cpp
View File

@ -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;