diff options
| author | Eugene Sandulenko | 2004-11-21 00:37:18 +0000 |
|---|---|---|
| committer | Eugene Sandulenko | 2004-11-21 00:37:18 +0000 |
| commit | eb44281ecb6ae01155c3e93c31b29b14cfcd6e73 (patch) | |
| tree | 18dc5aa1497768cf2db643f446feeaed58485420 | |
| parent | fa97d4ad897452e0ee2d975c4bf4dda45737e4c3 (diff) | |
| download | scummvm-rg350-eb44281ecb6ae01155c3e93c31b29b14cfcd6e73.tar.gz scummvm-rg350-eb44281ecb6ae01155c3e93c31b29b14cfcd6e73.tar.bz2 scummvm-rg350-eb44281ecb6ae01155c3e93c31b29b14cfcd6e73.zip | |
o Removed astray debug output.
o MT-32 music is correct, though Adlib is not. There is apparently custom
instrument remapping similiar to mt32->gm but it is different. With
that remapping it sounds much closer to original.
svn-id: r15850
| -rw-r--r-- | saga/music.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/saga/music.cpp b/saga/music.cpp index 881bfc68a2..d731667142 100644 --- a/saga/music.cpp +++ b/saga/music.cpp @@ -179,7 +179,7 @@ AudioStream *makeRAWStream(const char *filename, uint32 pos, int size, bool loop return audioStream; } -MusicPlayer::MusicPlayer(MidiDriver *driver) : _parser(0), _driver(driver), _looping(false), _isPlaying(false), _passThrough(false) { + MusicPlayer::MusicPlayer(MidiDriver *driver) : _parser(0), _driver(driver), _looping(false), _isPlaying(false), _passThrough(false), _isGM(false) { memset(_channel, 0, sizeof(_channel)); _masterVolume = 0; this->open(); @@ -320,7 +320,6 @@ Music::Music(SoundMixer *mixer, MidiDriver *driver, int enabled) : _mixer(mixer) if (_musicContext != NULL) { _hasDigiMusic = true; - debug(0, "DHFJKHDFKJLHDFKLJHDFKJHDASF"); _musicFname = RSC_FileName(_musicContext); file.open(_musicFname); @@ -475,7 +474,12 @@ int Music::play(uint32 music_rn, uint16 flags) { return FAILURE; } - _player->setGM(true); + // FIXME: This is weird, but this way Adlib sounds closer to original, + // though instrument mapping is not correct + if (hasAdlib()) { + _player->setGM(false); + } + parser = MidiParser::createParser_XMIDI(); } |