aboutsummaryrefslogtreecommitdiff
path: root/scumm/imuse.cpp
diff options
context:
space:
mode:
authorJamieson Christian2003-10-05 15:36:52 +0000
committerJamieson Christian2003-10-05 15:36:52 +0000
commita722d0601e4ae87b15fe09f62b3a1076c6c8646e (patch)
tree511293906e3b210764b047191d68278e4d8cf138 /scumm/imuse.cpp
parent7174a32c8e877627c51da50b657083873aeef1e6 (diff)
downloadscummvm-rg350-a722d0601e4ae87b15fe09f62b3a1076c6c8646e.tar.gz
scummvm-rg350-a722d0601e4ae87b15fe09f62b3a1076c6c8646e.tar.bz2
scummvm-rg350-a722d0601e4ae87b15fe09f62b3a1076c6c8646e.zip
Preliminary preparation for new YM2612 FM emulator.
All the hooks are in, but actual implementation needs to be checked for portability. svn-id: r10615
Diffstat (limited to 'scumm/imuse.cpp')
-rw-r--r--scumm/imuse.cpp11
1 files changed, 8 insertions, 3 deletions
diff --git a/scumm/imuse.cpp b/scumm/imuse.cpp
index 223e32ad4f..602627ef4b 100644
--- a/scumm/imuse.cpp
+++ b/scumm/imuse.cpp
@@ -54,6 +54,7 @@ _initialized(false),
_tempoFactor(0),
_player_limit(ARRAYSIZE(_players)),
_recycle_players(false),
+_direct_passthrough(false),
_queue_end(0),
_queue_pos(0),
_queue_sound(0),
@@ -250,7 +251,7 @@ bool IMuseInternal::startSound(int sound) {
return false;
player->clear();
- return player->startSound(sound, driver);
+ return player->startSound(sound, driver, _direct_passthrough);
}
@@ -1117,10 +1118,14 @@ uint32 IMuseInternal::property(int prop, uint32 value) {
break;
case IMuse::PROP_RECYCLE_PLAYERS:
- if (value > 0 && value <= ARRAYSIZE(_players))
- _recycle_players = (value != 0);
+ _recycle_players = (value != 0);
+ break;
+
+ case IMuse::PROP_DIRECT_PASSTHROUGH:
+ _direct_passthrough = (value != 0);
break;
}
+
return 0;
}