From: <ya...@us...> - 2008-12-30 21:54:16
|
Revision: 1331 http://desmume.svn.sourceforge.net/desmume/?rev=1331&view=rev Author: yabause Date: 2008-12-30 21:49:16 +0000 (Tue, 30 Dec 2008) Log Message: ----------- Ooops... forgot 1328 in my previous merge :) Modified Paths: -------------- branches/release_0_9/src/SPU.cpp Property Changed: ---------------- branches/release_0_9/ Property changes on: branches/release_0_9 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk/desmume:1306,1314-1319,1321-1322,1327 + /trunk/desmume:1306,1314-1319,1321-1322,1327-1328 Modified: branches/release_0_9/src/SPU.cpp =================================================================== --- branches/release_0_9/src/SPU.cpp 2008-12-30 21:46:04 UTC (rev 1330) +++ branches/release_0_9/src/SPU.cpp 2008-12-30 21:49:16 UTC (rev 1331) @@ -40,12 +40,12 @@ #define CHANSTAT_STOPPED 0 #define CHANSTAT_PLAY 1 -s8 indextbl[8] = +const s8 indextbl[8] = { -1, -1, -1, -1, 2, 4, 6, 8 }; -u16 adpcmtbl[89] = +const u16 adpcmtbl[89] = { 0x0007, 0x0008, 0x0009, 0x000A, 0x000B, 0x000C, 0x000D, 0x000E, 0x0010, 0x0011, 0x0013, 0x0015, 0x0017, 0x0019, 0x001C, 0x001F, 0x0022, 0x0025, @@ -59,7 +59,7 @@ 0x41B2, 0x4844, 0x4F7E, 0x5771, 0x602F, 0x69CE, 0x7462, 0x7FFF }; -s16 wavedutytbl[8][8] = { +const s16 wavedutytbl[8][8] = { { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF }, { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF }, { -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, -0x7FFF, 0x7FFF, 0x7FFF, 0x7FFF }, This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |