aboutsummaryrefslogtreecommitdiff
path: root/engines/agi/sound.cpp
diff options
context:
space:
mode:
authorKari Salminen2007-08-17 13:10:57 +0000
committerKari Salminen2007-08-17 13:10:57 +0000
commitaa8db3f74fc6460087a919a79a380b5346d117d6 (patch)
treeb829a8ef77a3e4f24060d3071c8bacc6362c1ada /engines/agi/sound.cpp
parent62d5f0629c7003ffb4f587d7dc3d3af6d80bd57b (diff)
downloadscummvm-rg350-aa8db3f74fc6460087a919a79a380b5346d117d6.tar.gz
scummvm-rg350-aa8db3f74fc6460087a919a79a380b5346d117d6.tar.bz2
scummvm-rg350-aa8db3f74fc6460087a919a79a380b5346d117d6.zip
Added a definition for Apple IIGS sound emulation mode, made sound initialization set it when appropriate and instruments loading use it.
svn-id: r28647
Diffstat (limited to 'engines/agi/sound.cpp')
-rw-r--r--engines/agi/sound.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp
index 9b2f88cff6..340e61c009 100644
--- a/engines/agi/sound.cpp
+++ b/engines/agi/sound.cpp
@@ -440,6 +440,9 @@ int SoundMgr::initSound() {
case SOUND_EMU_MAC:
waveform = waveformMac;
break;
+ case SOUND_EMU_APPLE2GS:
+ loadInstruments();
+ break;
}
report("Initializing sound:\n");
@@ -451,8 +454,6 @@ int SoundMgr::initSound() {
report("disabled\n");
}
- loadInstruments();
-
_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_soundHandle, this, -1, Audio::Mixer::kMaxChannelVolume, 0, false, true);
return r;