aboutsummaryrefslogtreecommitdiff
path: root/kyra/sound.cpp
diff options
context:
space:
mode:
authorJames Brown2004-11-14 14:11:54 +0000
committerJames Brown2004-11-14 14:11:54 +0000
commit8f1307ff6ca772b43b10ba77e9d32ddcc1c67f62 (patch)
tree8b88cd0b651667f6b026a1e00154e2095c647192 /kyra/sound.cpp
parent61efd5ff0ea65b9e2f2d5f0ea956cc4755809bb8 (diff)
downloadscummvm-rg350-8f1307ff6ca772b43b10ba77e9d32ddcc1c67f62.tar.gz
scummvm-rg350-8f1307ff6ca772b43b10ba77e9d32ddcc1c67f62.tar.bz2
scummvm-rg350-8f1307ff6ca772b43b10ba77e9d32ddcc1c67f62.zip
Patch #1066150 from eriktorbjorn - Enable adlib emulated midi as fallback where hardware synth is unavailable.
svn-id: r15807
Diffstat (limited to 'kyra/sound.cpp')
-rw-r--r--kyra/sound.cpp6
1 files changed, 6 insertions, 0 deletions
diff --git a/kyra/sound.cpp b/kyra/sound.cpp
index d631f35b5a..40b73efed1 100644
--- a/kyra/sound.cpp
+++ b/kyra/sound.cpp
@@ -18,6 +18,7 @@ namespace Kyra {
MusicPlayer::MusicPlayer(MidiDriver* driver, KyraEngine* engine) {
_engine = engine;
_driver = driver;
+ _passThrough = false;
_isPlaying = _nativeMT32 = false;
memset(_channel, 0, sizeof(MidiChannel*) * 16);
@@ -73,6 +74,11 @@ namespace Kyra {
}
void MusicPlayer::send(uint32 b) {
+ if (_passThrough) {
+ _driver->send(b);
+ return;
+ }
+
uint8 channel = (byte)(b & 0x0F);
if ((b & 0xFFF0) == 0x07B0) {
// Adjust volume changes by master volume