diff options
| author | Filippos Karapetis | 2010-01-04 08:06:11 +0000 |
|---|---|---|
| committer | Filippos Karapetis | 2010-01-04 08:06:11 +0000 |
| commit | ed06df7a25874f1ba98ed51fbc3669a4ef637501 (patch) | |
| tree | bd221b692861b9e864901c6d07650ad22b603439 | |
| parent | 8fb870b0e385a888585b00f4a38e19a3c37cd901 (diff) | |
| download | scummvm-rg350-ed06df7a25874f1ba98ed51fbc3669a4ef637501.tar.gz scummvm-rg350-ed06df7a25874f1ba98ed51fbc3669a4ef637501.tar.bz2 scummvm-rg350-ed06df7a25874f1ba98ed51fbc3669a4ef637501.zip | |
SCI/new music code: The number of voices is now obtained from the MIDI driver
svn-id: r46964
| -rw-r--r-- | engines/sci/sfx/music.cpp | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/engines/sci/sfx/music.cpp b/engines/sci/sfx/music.cpp index 1b0f00f41f..4603b30f96 100644 --- a/engines/sci/sfx/music.cpp +++ b/engines/sci/sfx/music.cpp @@ -125,18 +125,9 @@ void SciMusic::soundSetSoundOn(bool soundOnFlag) { } uint16 SciMusic::soundGetVoices() { - switch (_midiType) { - case MD_PCSPK: - return 1; - case MD_PCJR: - return 3; - case MD_ADLIB: - return 8; - case MD_MT32: - return 16; - default: - return 1; - } + Common::StackLock lock(_mutex); + + return _pMidiDrv->getPolyphony(); } MusicEntry *SciMusic::getSlot(reg_t obj) { |