diff options
author | Jerome Fisher | 2004-11-27 14:53:37 +0000 |
---|---|---|
committer | Jerome Fisher | 2004-11-27 14:53:37 +0000 |
commit | 8d0ab890f8597c90d8f51caf1ed416e1df60848a (patch) | |
tree | 75d956f5d5e7998d7028c72002448fbc5e32dd38 /scumm/debugger.cpp | |
parent | 1a7ca2dc2a71fed65673b4e3934f2151cc8475d1 (diff) | |
download | scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.tar.gz scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.tar.bz2 scummvm-rg350-8d0ab890f8597c90d8f51caf1ed416e1df60848a.zip |
To really, truly fix the multi-midi race condition, the adlib driver is now always created before iMuse initialisation. This necessitated removing the multimidi toggle from the debug console.
svn-id: r15912
Diffstat (limited to 'scumm/debugger.cpp')
-rw-r--r-- | scumm/debugger.cpp | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/scumm/debugger.cpp b/scumm/debugger.cpp index c2c206c416..959d884a31 100644 --- a/scumm/debugger.cpp +++ b/scumm/debugger.cpp @@ -144,15 +144,6 @@ bool ScummDebugger::Cmd_IMuse(int argc, const char **argv) { DebugPrintf("AAAIIIEEEEEE!\n"); DebugPrintf("Shutting down all music tracks\n"); return true; - } else if (!strcmp (argv[1], "multimidi")) { - if (argc > 2 && (!strcmp(argv[2], "on") || !strcmp(argv[2], "off"))) { - if (_vm->_imuse) - _vm->_imuse->property(IMuse::PROP_MULTI_MIDI, !strcmp(argv[2], "on")); - DebugPrintf("MultiMidi mode switched %s.\n", argv[2]); - } else { - DebugPrintf("Specify \"on\" or \"off\" to switch.\n"); - } - return true; } else if (!strcmp(argv[1], "play")) { if (argc > 2 && (!strcmp(argv[2], "random") || atoi(argv[2]) != 0)) { int sound = atoi(argv[2]); @@ -186,7 +177,6 @@ bool ScummDebugger::Cmd_IMuse(int argc, const char **argv) { DebugPrintf("Available iMuse commands:\n"); DebugPrintf(" panic - Stop all music tracks\n"); - DebugPrintf(" multimidi on/off - Toggle dual MIDI drivers\n"); DebugPrintf(" play # - Play a music resource\n"); DebugPrintf(" stop # - Stop a music resource\n"); return true; |