diff options
| author | Filippos Karapetis | 2012-12-13 03:09:41 +0200 |
|---|---|---|
| committer | Filippos Karapetis | 2012-12-13 03:09:41 +0200 |
| commit | 07994fb3610ddf1b3b23fbd53aaff44a4626f756 (patch) | |
| tree | 9e192dc83904d156bb18ecd2e6e1b2cdb7ddb7bf /engines/tinsel/music.cpp | |
| parent | a3f22b88042d2dbbcbe5a82689da16183e974c7a (diff) | |
| download | scummvm-rg350-07994fb3610ddf1b3b23fbd53aaff44a4626f756.tar.gz scummvm-rg350-07994fb3610ddf1b3b23fbd53aaff44a4626f756.tar.bz2 scummvm-rg350-07994fb3610ddf1b3b23fbd53aaff44a4626f756.zip | |
TINSEL: Add support for the digitized music in DW1 Mac
Diffstat (limited to 'engines/tinsel/music.cpp')
| -rw-r--r-- | engines/tinsel/music.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 91f0312101..dab2a897fc 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -135,10 +135,10 @@ bool PlayMidiSequence(uint32 dwFileOffset, bool bLoop) { if (ConfMan.hasKey("mute")) mute = ConfMan.getBool("mute"); - // TODO: The Macintosh version of DW1 does not use MIDI for music + // The Macintosh version of DW1 uses raw PCM for music if (TinselV1Mac) - return true; - + return _vm->_sound->playDW1MacMusic(dwFileOffset); + SetMidiVolume(mute ? 0 : _vm->_config->_musicVolume); // the index and length of the last tune loaded @@ -285,7 +285,8 @@ void OpenMidiFiles() { if (TinselV0 || TinselV2) return; - // TODO: The Macintosh version of DW1 does not use MIDI for music + // The Macintosh version of DW1 does not use MIDI for music. + // It uses PCM music instead, which is quite big to be preloaded here. if (TinselV1Mac) return; |