diff options
| author | Jamieson Christian | 2006-03-05 21:30:44 +0000 |
|---|---|---|
| committer | Jamieson Christian | 2006-03-05 21:30:44 +0000 |
| commit | 5e25b3b679d61a92a39f2d9ee699fad50b0bcbb6 (patch) | |
| tree | ba6b9b417a8a3f7e18e8f387db53a6f42ec3b3c5 /engines/scumm/imuse/imuse_player.cpp | |
| parent | 27e49b6f5674df4ba1ae0d1d1d8eba39c9fa1b76 (diff) | |
| download | scummvm-rg350-5e25b3b679d61a92a39f2d9ee699fad50b0bcbb6.tar.gz scummvm-rg350-5e25b3b679d61a92a39f2d9ee699fad50b0bcbb6.tar.bz2 scummvm-rg350-5e25b3b679d61a92a39f2d9ee699fad50b0bcbb6.zip | |
Restructured IMuse and IMuseInternal.
* IMuse is no longer a concurrency front-end.
* IMuseInternal now derives from IMuse.
* Common::StackLock used to protect thread-sensitive interface methods (same as IMuseDigital).
* clear_queue() included in stopAllSounds() so it can be removed from the public interface.
* Game ID now specified at init using property().
* Timer callbacks receive a struct containing IMuseInternal and MidiDriver refs, instead of just the latter.
* OSystem pointer from init is now cached and used instead of global.
All references to the g_system and g_scumm globals are now gone. BOOYAH!
Tested with MI2, DOTT and S&M, under Windows, in Native MIDI, Adlib, and Mixed modes. No regressions or concurrency issues observed. Manifestations of the latter are the biggest concern at this point.
svn-id: r21104
Diffstat (limited to 'engines/scumm/imuse/imuse_player.cpp')
| -rw-r--r-- | engines/scumm/imuse/imuse_player.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/engines/scumm/imuse/imuse_player.cpp b/engines/scumm/imuse/imuse_player.cpp index e2f7994b68..f271fddb92 100644 --- a/engines/scumm/imuse/imuse_player.cpp +++ b/engines/scumm/imuse/imuse_player.cpp @@ -395,7 +395,7 @@ void Player::sysEx(const byte *p, uint16 len) { switch (code = *p++) { case 0: - if (g_scumm->_game.id != GID_SAMNMAX) { + if (_se->_game_id != GID_SAMNMAX) { // There are 17 bytes of useful information beyond // what we've read so far. All we know about them is // as follows: |