[Scummvm-cvs-logs] SF.net SVN: scummvm:[38211] scummvm/trunk/sound

sev at users.sourceforge.net sev at users.sourceforge.net
Sun Feb 15 11:07:50 CET 2009


Revision: 38211
          http://scummvm.svn.sourceforge.net/scummvm/?rev=38211&view=rev
Author:   sev
Date:     2009-02-15 10:07:50 +0000 (Sun, 15 Feb 2009)

Log Message:
-----------
Add interleave parameter to FMOPL as needed by SCI engine

Modified Paths:
--------------
    scummvm/trunk/sound/fmopl.cpp
    scummvm/trunk/sound/fmopl.h

Modified: scummvm/trunk/sound/fmopl.cpp
===================================================================
--- scummvm/trunk/sound/fmopl.cpp	2009-02-15 10:04:29 UTC (rev 38210)
+++ scummvm/trunk/sound/fmopl.cpp	2009-02-15 10:07:50 UTC (rev 38211)
@@ -978,7 +978,7 @@
 /*******************************************************************************/
 
 /* ---------- update one of chip ----------- */
-void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length) {
+void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length, int interleave) {
 	int i;
 	int data;
 	int16 *buf = buffer;
@@ -1020,7 +1020,7 @@
 		/* limit check */
 		data = CLIP(outd[0], OPL_MINOUT, OPL_MAXOUT);
 		/* store to sound buffer */
-		buf[i] = data >> OPL_OUTSB;
+		buf[i << interleave] = data >> OPL_OUTSB;
 	}
 
 	OPL->amsCnt = amsCnt;

Modified: scummvm/trunk/sound/fmopl.h
===================================================================
--- scummvm/trunk/sound/fmopl.h	2009-02-15 10:04:29 UTC (rev 38210)
+++ scummvm/trunk/sound/fmopl.h	2009-02-15 10:07:50 UTC (rev 38211)
@@ -165,7 +165,7 @@
 unsigned char OPLRead(FM_OPL *OPL, int a);
 int OPLTimerOver(FM_OPL *OPL, int c);
 void OPLWriteReg(FM_OPL *OPL, int r, int v);
-void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length);
+void YM3812UpdateOne(FM_OPL *OPL, int16 *buffer, int length, int interleave = 0);
 
 // Factory method
 FM_OPL *makeAdlibOPL(int rate);


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




More information about the Scummvm-git-logs mailing list