[Scummvm-cvs-logs] SF.net SVN: scummvm:[46964] scummvm/trunk/engines/sci/sfx/music.cpp

[thebluegr at users.sourceforge.net]

Revision: 46964
          http://scummvm.svn.sourceforge.net/scummvm/?rev=46964&view=rev
Author:   thebluegr
Date:     2010-01-04 08:06:11 +0000 (Mon, 04 Jan 2010)

Log Message:
-----------
SCI/new music code: The number of voices is now obtained from the MIDI driver

Modified Paths:
--------------
    scummvm/trunk/engines/sci/sfx/music.cpp

Modified: scummvm/trunk/engines/sci/sfx/music.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-03 23:30:23 UTC (rev 46963)
+++ scummvm/trunk/engines/sci/sfx/music.cpp	2010-01-04 08:06:11 UTC (rev 46964)
@@ -125,18 +125,9 @@
 }
 
 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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.