[Scummvm-cvs-logs] SF.net SVN: scummvm:[52837] scummvm/branches/branch-1-2-0/engines/agi
sev at users.sourceforge.net
sev at users.sourceforge.net
Tue Sep 21 07:37:51 CEST 2010
Revision: 52837
http://scummvm.svn.sourceforge.net/scummvm/?rev=52837&view=rev
Author: sev
Date: 2010-09-21 05:37:51 +0000 (Tue, 21 Sep 2010)
Log Message:
-----------
AGI: Backport changing meaning of pcjr sound device
Modified Paths:
--------------
scummvm/branches/branch-1-2-0/engines/agi/agi.cpp
scummvm/branches/branch-1-2-0/engines/agi/sound.cpp
Modified: scummvm/branches/branch-1-2-0/engines/agi/agi.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/agi.cpp 2010-09-21 05:36:51 UTC (rev 52836)
+++ scummvm/branches/branch-1-2-0/engines/agi/agi.cpp 2010-09-21 05:37:51 UTC (rev 52837)
@@ -578,17 +578,23 @@
} 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;
}
Modified: scummvm/branches/branch-1-2-0/engines/agi/sound.cpp
===================================================================
--- scummvm/branches/branch-1-2-0/engines/agi/sound.cpp 2010-09-21 05:36:51 UTC (rev 52836)
+++ scummvm/branches/branch-1-2-0/engines/agi/sound.cpp 2010-09-21 05:37:51 UTC (rev 52837)
@@ -173,12 +173,12 @@
_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;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list