DeSmuME

Revision: 4324
          http://desmume.svn.sourceforge.net/desmume/?rev=4324&view=rev
Author:   gocha
Date:     2012-07-27 11:26:55 +0000 (Fri, 27 Jul 2012)
Log Message:
-----------
0.9.8: merge r4255,r4269,r4286,r4288,r4302,r4322,r4323

Revision Links:
--------------
    http://desmume.svn.sourceforge.net/desmume/?rev=4255&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4269&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4286&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4288&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4302&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4322&view=rev
    http://desmume.svn.sourceforge.net/desmume/?rev=4323&view=rev

Modified Paths:
--------------
    branches/release_0_9_8/desmume/src/GPU.cpp
    branches/release_0_9_8/desmume/src/GPU_osd.cpp
    branches/release_0_9_8/desmume/src/MMU.cpp
    branches/release_0_9_8/desmume/src/NDSSystem.cpp
    branches/release_0_9_8/desmume/src/NDSSystem.h
    branches/release_0_9_8/desmume/src/lua-engine.cpp
    branches/release_0_9_8/desmume/src/windows/hotkey.cpp
    branches/release_0_9_8/desmume/src/windows/hotkey.h
    branches/release_0_9_8/desmume/src/windows/main.cpp
    branches/release_0_9_8/desmume/src/windows/main.h
    branches/release_0_9_8/desmume/src/windows/resource.h
    branches/release_0_9_8/desmume/src/windows/resources.rc
    branches/release_0_9_8/desmume/src/windows/soundView.cpp

Modified: branches/release_0_9_8/desmume/src/GPU.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/GPU.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/GPU.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -2038,8 +2038,9 @@
 	switch(gpu->setFinalColorBck_funcNum)
 	{
 		//for backdrops, blend isnt applied (it's illogical, isnt it?)
-		case 0: 
-		case 1: 
+		case 0:
+		case 1:
+PLAIN_CLEAR:
 			memset_u16_le<256>(gpu->currDst,backdrop_color); 
 			break;
 
@@ -2047,10 +2048,12 @@
 		case 2:
 			if(gpu->BLDCNT & 0x20) //backdrop is selected for color effect
 				memset_u16_le<256>(gpu->currDst,gpu->currentFadeInColors[backdrop_color]);
+			else goto PLAIN_CLEAR;
 			break;
 		case 3:
 			if(gpu->BLDCNT & 0x20) //backdrop is selected for color effect
 				memset_u16_le<256>(gpu->currDst,gpu->currentFadeOutColors[backdrop_color]);
+			else goto PLAIN_CLEAR;
 			break;
 
 		//windowed cases apparently need special treatment? why? can we not render the backdrop? how would that even work?

Modified: branches/release_0_9_8/desmume/src/GPU_osd.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/GPU_osd.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/GPU_osd.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -433,9 +433,10 @@
 			aggDraw.hud->line(temptouch.X, temptouch.Y - 256, temptouch.X, temptouch.Y + 384); //vert
 		}
 
-	if(nds.isTouch) {
-		temptouch.X = nds.scr_touchX;
-		temptouch.Y = nds.scr_touchY;
+	if(nds.isTouch)
+	{
+		temptouch.X = nds.scr_touchX / 16;
+		temptouch.Y = nds.scr_touchY / 16;
 		aggDraw.hud->lineColor(255, 0, 0, 128);
 		aggDraw.hud->line(temptouch.X - 256, temptouch.Y + 192, temptouch.X + 256, temptouch.Y + 192); //horiz
 		aggDraw.hud->line(temptouch.X, temptouch.Y - 256, temptouch.X, temptouch.Y + 384); //vert

Modified: branches/release_0_9_8/desmume/src/MMU.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/MMU.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/MMU.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -4029,8 +4029,11 @@
 										if(nds.adc_jitterctr == 25)
 										{
 											nds.adc_jitterctr = 0;
-											nds.adc_touchY ^= 16;
-											nds.adc_touchX ^= 16;
+											if (nds.stylusJitter)
+											{
+												nds.adc_touchY ^= 16;
+												nds.adc_touchX ^= 16;
+											}
 										}
 										if(MMU.SPI_CNT&(1<<11))
 										{

Modified: branches/release_0_9_8/desmume/src/NDSSystem.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/NDSSystem.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/NDSSystem.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -2482,6 +2482,7 @@
 	nds.ConsoleType = CommonSettings.ConsoleType;
 	nds._DebugConsole = CommonSettings.DebugConsole;
 	nds.ensataEmulation = CommonSettings.EnsataEmulation;
+	nds.stylusJitter = CommonSettings.StylusJitter;
 	nds.ensataHandshake = ENSATA_HANDSHAKE_none;
 	nds.ensataIpcSyncCounter = 0;
 	SetupMMU(nds.Is_DebugConsole(),nds.Is_DSI());

Modified: branches/release_0_9_8/desmume/src/NDSSystem.h
===================================================================
--- branches/release_0_9_8/desmume/src/NDSSystem.h	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/NDSSystem.h	2012-07-27 11:26:55 UTC (rev 4324)
@@ -177,6 +177,7 @@
 	u16 adc_touchX;
 	u16 adc_touchY;
 	s32 adc_jitterctr;
+	BOOL stylusJitter;
 
 	//the DSI returns calibrated touch coords from its TSC (?), so we need to save these separately
 	u16 scr_touchX;
@@ -507,6 +508,7 @@
 		, spu_advanced(false)
 		, StylusPressure(50)
 		, ConsoleType(NDS_CONSOLE_TYPE_FAT)
+		, StylusJitter(true)
 	{
 		strcpy(ARM9BIOS, "biosnds9.bin");
 		strcpy(ARM7BIOS, "biosnds7.bin");
@@ -553,6 +555,7 @@
 	bool rigorous_timing;
 
 	int StylusPressure;
+	bool StylusJitter;
 
 	bool dispLayers[2][5];
 	

Modified: branches/release_0_9_8/desmume/src/lua-engine.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/lua-engine.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/lua-engine.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -1856,7 +1856,7 @@
 	{
 		if(IsHardwareAddressValid(a))
 		{
-			unsigned char value = (unsigned char)(_MMU_read08<ARMCPU_ARM9>(address) & 0xFF);
+			unsigned char value = (unsigned char)(_MMU_read08<ARMCPU_ARM9>(a) & 0xFF);
 			lua_pushinteger(L, value);
 			lua_rawseti(L, -2, n);
 		}
@@ -4421,7 +4421,8 @@
 	return 0;
 }
 
-static int stylus_read(lua_State *L){
+DEFINE_LUA_FUNCTION(stylus_read, "")
+{
 	
 	lua_newtable(L);
 
@@ -4434,7 +4435,8 @@
 
 	return 1;
 }
-static int stylus_peek(lua_State *L){
+DEFINE_LUA_FUNCTION(stylus_peek, "")
+{
 	
 	lua_newtable(L);
 
@@ -4452,7 +4454,7 @@
 	pixCoord = std::min(std::max(pixCoord, 0), maximum-1);
 	return (pixCoord << 4) & 0x0FF0;
 }
-static int stylus_write(lua_State *L)
+DEFINE_LUA_FUNCTION(stylus_write, "table")
 {
 	if(movieMode == MOVIEMODE_PLAY) // don't allow tampering with a playing movie's input
 		return 0; // (although it might be useful sometimes...)

Modified: branches/release_0_9_8/desmume/src/windows/hotkey.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/windows/hotkey.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/hotkey.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -450,8 +450,20 @@
 	if(CommonSettings.StylusPressure<0) CommonSettings.StylusPressure = 0;
 	osd->addLine("Stylus Pressure to %d%%",CommonSettings.StylusPressure);
 }
+void HK_ToggleStylusJitter(int, bool justPressed) {
+	CommonSettings.StylusJitter = !CommonSettings.StylusJitter;
+	nds.stylusJitter = CommonSettings.StylusJitter;
+	WritePrivateProfileBool("Emulation", "StylusJitter", CommonSettings.StylusJitter, IniName);
+	osd->addLine("Stylus Jitter %s",CommonSettings.StylusJitter ? "On" : "Off");
+}
 
+void HK_Rotate0(int, bool justPressed) { SetRotate(MainWindow->getHWnd(), 0);}
+void HK_Rotate90(int, bool justPressed) { SetRotate(MainWindow->getHWnd(), 90);}
+void HK_Rotate180(int, bool justPressed) { SetRotate(MainWindow->getHWnd(), 180);}
+void HK_Rotate270(int, bool justPressed) { SetRotate(MainWindow->getHWnd(), 270);}
 
+
+
 //======================================================================================
 //=====================================DEFINITIONS======================================
 //======================================================================================
@@ -535,6 +547,12 @@
 	keys->DecreaseSpeed.page = HOTKEY_PAGE_MAIN;
 	keys->DecreaseSpeed.key = VK_OEM_MINUS;
 
+	keys->ToggleStylusJitter.handleKeyDown = HK_ToggleStylusJitter;
+	keys->ToggleStylusJitter.code = "ToggleStylusJitter";
+	keys->ToggleStylusJitter.name = STRW(ID_LABEL_HK61);
+	keys->ToggleStylusJitter.page = HOTKEY_PAGE_MAIN;
+	keys->ToggleStylusJitter.key = NULL;
+
 	keys->FrameLimitToggle.handleKeyDown = HK_FrameLimitToggle;
 	keys->FrameLimitToggle.code = "FrameLimitToggle";
 	keys->FrameLimitToggle.name = STRW(ID_LABEL_HK8b);
@@ -808,6 +826,31 @@
 	keys->ResetLagCounter.page = HOTKEY_PAGE_MOVIE;
 	keys->ResetLagCounter.key = NULL;
 
+	//Other Page -------------------------------------------------------
+	keys->Rotate0.handleKeyDown = HK_Rotate0;
+	keys->Rotate0.code = "Rotate0";
+	keys->Rotate0.name = STRW(ID_LABEL_HK57);
+	keys->Rotate0.page = HOTKEY_PAGE_OTHER;
+	keys->Rotate0.key = NULL;
+
+	keys->Rotate90.handleKeyDown = HK_Rotate90;
+	keys->Rotate90.code = "Rotate90";
+	keys->Rotate90.name = STRW(ID_LABEL_HK58);
+	keys->Rotate90.page = HOTKEY_PAGE_OTHER;
+	keys->Rotate90.key = NULL;
+
+	keys->Rotate180.handleKeyDown = HK_Rotate180;
+	keys->Rotate180.code = "Rotate180";
+	keys->Rotate180.name = STRW(ID_LABEL_HK59);
+	keys->Rotate180.page = HOTKEY_PAGE_OTHER;
+	keys->Rotate180.key = NULL;
+
+	keys->Rotate270.handleKeyDown = HK_Rotate270;
+	keys->Rotate270.code = "Rotate270";
+	keys->Rotate270.name = STRW(ID_LABEL_HK60);
+	keys->Rotate270.page = HOTKEY_PAGE_OTHER;
+	keys->Rotate270.key = NULL;
+
 	//StateSlots Page --------------------------------------------------
 	keys->NextSaveSlot.handleKeyDown = HK_NextSaveSlot;
 	keys->NextSaveSlot.code = "NextSaveSlot";

Modified: branches/release_0_9_8/desmume/src/windows/hotkey.h
===================================================================
--- branches/release_0_9_8/desmume/src/windows/hotkey.h	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/hotkey.h	2012-07-27 11:26:55 UTC (rev 4324)
@@ -30,6 +30,7 @@
 	HOTKEY_PAGE_STATE,
 	HOTKEY_PAGE_STATE_SLOTS,
 	HOTKEY_PAGE_TURBO,
+	HOTKEY_PAGE_OTHER,
 	NUM_HOTKEY_PAGE,
 };
 
@@ -39,6 +40,7 @@
 	_T("Savestates"),
 	_T("Savestate Slots"),
 	_T("Turbo"),
+	_T("Other"),
 	_T("NUM_HOTKEY_PAGE"),
 };
 
@@ -65,8 +67,10 @@
 	SCustomKey Slot[10];
 	SCustomKey QuickSave, QuickLoad, NextSaveSlot, PreviousSaveSlot;
 
-	SCustomKey OpenROM, ReloadROM, Reset, Pause, FrameAdvance, FastForward, FastForwardToggle, IncreaseSpeed, DecreaseSpeed, FrameLimitToggle, Microphone, IncreasePressure, DecreasePressure;
+	SCustomKey Rotate0, Rotate90, Rotate180, Rotate270;
 
+	SCustomKey OpenROM, ReloadROM, Reset, Pause, FrameAdvance, FastForward, FastForwardToggle, IncreaseSpeed, DecreaseSpeed, FrameLimitToggle, Microphone, IncreasePressure, DecreasePressure, ToggleStylusJitter;
+
 	SCustomKey PlayMovie, RecordMovie, StopMovie, ToggleReadOnly;
 	
 	SCustomKey TurboRight, TurboLeft, TurboDown, TurboUp, TurboSelect, TurboStart, TurboB, TurboA, TurboY, TurboX, TurboR, TurboL;

Modified: branches/release_0_9_8/desmume/src/windows/main.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/windows/main.cpp	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/main.cpp	2012-07-27 11:26:55 UTC (rev 4324)
@@ -435,8 +435,6 @@
 
 void SetScreenGap(int gap);
 
-void SetRotate(HWND hwnd, int rot, bool user=true);
-
 bool ForceRatio = true;
 bool SeparationBorderDrag = true;
 int ScreenGapColor = 0xFFFFFF;

Modified: branches/release_0_9_8/desmume/src/windows/main.h
===================================================================
--- branches/release_0_9_8/desmume/src/windows/main.h	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/main.h	2012-07-27 11:26:55 UTC (rev 4324)
@@ -41,6 +41,7 @@
 void WavEnd();
 void UpdateToolWindows();
 bool DemandLua();
+void SetRotate(HWND hwnd, int rot, bool user = true);
 
 extern bool frameCounterDisplay;
 extern bool FpsDisplay;

Modified: branches/release_0_9_8/desmume/src/windows/resource.h
===================================================================
--- branches/release_0_9_8/desmume/src/windows/resource.h	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/resource.h	2012-07-27 11:26:55 UTC (rev 4324)
@@ -800,6 +800,11 @@
 #define ID_LABEL_HK54                   4519
 #define ID_LABEL_HK55                   4520
 #define ID_LABEL_HK56                   4521
+#define ID_LABEL_HK57                   4522
+#define ID_LABEL_HK58                   4523
+#define ID_LABEL_HK59                   4524
+#define ID_LABEL_HK60                   4525
+#define ID_LABEL_HK61                   4526
 #define IDD_MICROPHONE                  5000
 #define IDM_MICROPHONESETTINGS          5001
 #define IDC_MICSAMPLEBROWSE             5003

Modified: branches/release_0_9_8/desmume/src/windows/resources.rc
===================================================================
--- branches/release_0_9_8/desmume/src/windows/resources.rc	2012-07-27 10:31:23 UTC (rev 4323)
+++ branches/release_0_9_8/desmume/src/windows/resources.rc	2012-07-27 11:26:55 UTC (rev 4324)
@@ -3485,6 +3485,8 @@

Revision: 4334
          http://desmume.svn.sourceforge.net/desmume/?rev=4334&view=rev
Author:   gocha
Date:     2012-07-29 02:58:18 +0000 (Sun, 29 Jul 2012)
Log Message:
-----------
0.9.8: reset firmware at the beginning of movie playing/recording when desmume doesn't use external firmware.
0.9.8: add firmware to savestate by an experimental way.

Since Ragnarok Online DS (J) writes to firmware during the game (at the very beginning of the game, at least), this change is needed for anti-desync purpuse. I want to apply the same thing to trunk, but I guess it should be done by more polished way. This change to saves.cpp looks too hacky, but I have no idea how I can improve it.

Modified Paths:
--------------
    branches/release_0_9_8/desmume/src/movie.cpp
    branches/release_0_9_8/desmume/src/saves.cpp

Modified: branches/release_0_9_8/desmume/src/movie.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/movie.cpp	2012-07-28 22:43:33 UTC (rev 4333)
+++ branches/release_0_9_8/desmume/src/movie.cpp	2012-07-29 02:58:18 UTC (rev 4334)
@@ -566,6 +566,12 @@
 	//fully reload the game to reinitialize everything before playing any movie
 	//poweron(true);
 
+	// reset firmware (some games can write to it)
+	if (CommonSettings.UseExtFirmware == false)
+	{
+		NDS_CreateDummyFirmware(&CommonSettings.InternalFirmConf);
+	}
+
 	NDS_Reset();
 
 	////WE NEED TO LOAD A SAVESTATE
@@ -675,6 +681,12 @@
 	currMovieData.romFilename = path.GetRomName();
 	currMovieData.rtcStart = rtcstart;
 
+	// reset firmware (some games can write to it)
+	if (CommonSettings.UseExtFirmware == false)
+	{
+		NDS_CreateDummyFirmware(&CommonSettings.InternalFirmConf);
+	}
+
 	NDS_Reset();
 
 	//todo ?

Modified: branches/release_0_9_8/desmume/src/saves.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/saves.cpp	2012-07-28 22:43:33 UTC (rev 4333)
+++ branches/release_0_9_8/desmume/src/saves.cpp	2012-07-29 02:58:18 UTC (rev 4334)
@@ -230,6 +230,7 @@
 	{ "BUAZ", 1, 1,       &MMU.fw.addr_size},
 	{ "BUWE", 4, 1,       &MMU.fw.write_enable},
 	{ "BUWR", 4, 1,       &MMU.fw.writeable_buffer},
+	{ "BUJQ", 1, 0x40000, &MMU.fw.data}, // doesn't work (because of delayed allocation), needs dynamic modification, see writechunks and ReadStateChunks
 	//end memory chips
 
 	{ "MC0A", 4, 1,       &MMU.dscard[0].address},
@@ -258,7 +259,7 @@
 	{ "PMCR", 1, 5,			&MMU.powerMan_Reg},
 
 	{ "MR3D", 4, 1,		&MMU.reg_DISP3DCNT_bits},
-	
+
 	{ 0 }
 };
 
@@ -983,6 +984,16 @@
 extern SFORMAT SF_RTC[];
 
 static void writechunks(EMUFILE* os) {
+	// poor hack for firmware
+	SFORMAT* temp = SF_MMU;
+	while(temp->v) {
+		if(strcmp(temp->desc,"BUJQ") == 0) {
+			temp->v = MMU.fw.data;
+			temp->count = MMU.fw.size;
+		}
+		temp++;
+	}
+
 	savestate_WriteChunk(os,1,SF_ARM9);
 	savestate_WriteChunk(os,2,SF_ARM7);
 	savestate_WriteChunk(os,3,cp15_savestate);
@@ -1005,6 +1016,16 @@
 
 static bool ReadStateChunks(EMUFILE* is, s32 totalsize)
 {
+	// poor hack for firmware
+	SFORMAT* temp = SF_MMU;
+	while(temp->v) {
+		if(strcmp(temp->desc,"BUJQ") == 0) {
+			temp->v = MMU.fw.data;
+			temp->count = MMU.fw.size;
+		}
+		temp++;
+	}
+
 	bool ret = true;
 	while(totalsize > 0)
 	{

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

Revision: 4345
          http://desmume.svn.sourceforge.net/desmume/?rev=4345&view=rev
Author:   rogerman
Date:     2012-08-03 07:00:19 +0000 (Fri, 03 Aug 2012)
Log Message:
-----------
SPU (v0.9.8):
- Backport changes from r4306 to 0.9.8 branch.

Revision Links:
--------------
    http://desmume.svn.sourceforge.net/desmume/?rev=4306&view=rev

Modified Paths:
--------------
    branches/release_0_9_8/desmume/src/SPU.cpp
    branches/release_0_9_8/desmume/src/SPU.h

Modified: branches/release_0_9_8/desmume/src/SPU.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/SPU.cpp	2012-08-03 06:57:19 UTC (rev 4344)
+++ branches/release_0_9_8/desmume/src/SPU.cpp	2012-08-03 07:00:19 UTC (rev 4345)
@@ -40,7 +40,6 @@
 #include "NDSSystem.h"
 #include "matrix.h"
 
-#include "metaspu/metaspu.h"
 
 #define K_ADPCM_LOOPING_RECOVERY_INDEX 99999
 #define COSINE_INTERPOLATION_RESOLUTION 8192
@@ -1389,52 +1388,117 @@
 int spu_core_samples = 0;
 void SPU_Emulate_core()
 {
+	bool needToMix = true;
+	SoundInterface_struct *soundProcessor = SPU_SoundCore();
+	
 	samples += samples_per_hline;
 	spu_core_samples = (int)(samples);
 	samples -= spu_core_samples;
-
-	bool synchronize = (synchmode == ESynchMode_Synchronous);
-	bool mix = driver->AVI_IsRecording() || driver->WAV_IsRecording() || synchronize;
-
-	SPU_MixAudio(mix,SPU_core,spu_core_samples);
-	if(synchronize && SPU_currentCoreNum != SNDCORE_DUMMY)
-		synchronizer->enqueue_samples(SPU_core->outbuf, spu_core_samples);
+	
+	// We don't need to mix audio for Dual Synch/Asynch mode since we do this
+	// later in SPU_Emulate_user(). Disable mixing here to speed up processing.
+	if (synchmode == ESynchMode_DualSynchAsynch)
+	{
+		needToMix = false;
+	}
+	
+	SPU_MixAudio(needToMix, SPU_core, spu_core_samples);
+	
+	if (soundProcessor == NULL)
+	{
+		return;
+	}
+	
+	if (soundProcessor->FetchSamples != NULL)
+	{
+		soundProcessor->FetchSamples(SPU_core->outbuf, spu_core_samples, synchmode, synchronizer);
+	}
+	else
+	{
+		SPU_DefaultFetchSamples(SPU_core->outbuf, spu_core_samples, synchmode, synchronizer);
+	}
 }
 
 void SPU_Emulate_user(bool mix)
 {
-	u32 audiosize;
+	static s16 *postProcessBuffer = NULL;
+	static size_t postProcessBufferSize = 0;
+	size_t freeSampleCount = 0;
+	size_t processedSampleCount = 0;
+	SoundInterface_struct *soundProcessor = SPU_SoundCore();
+	
+	if (soundProcessor == NULL)
+	{
+		return;
+	}
+	
+	// Check to see how many free samples are available.
+	// If there are some, fill up the output buffer.
+	freeSampleCount = soundProcessor->GetAudioSpace();
+	if (freeSampleCount == 0)
+	{
+		return;
+	}
+	
+	//printf("mix %i samples\n", audiosize);
+	if (freeSampleCount > buffersize)
+	{
+		freeSampleCount = buffersize;
+	}
+	
+	// If needed, resize the post-process buffer to guarantee that
+	// we can store all the sound data.
+	if (postProcessBufferSize < freeSampleCount * 2 * sizeof(s16))
+	{
+		postProcessBufferSize = freeSampleCount * 2 * sizeof(s16);
+		postProcessBuffer = (s16 *)realloc(postProcessBuffer, postProcessBufferSize);
+	}
+	
+	if (soundProcessor->PostProcessSamples != NULL)
+	{
+		processedSampleCount = soundProcessor->PostProcessSamples(postProcessBuffer, freeSampleCount, synchmode, synchronizer);
+	}
+	else
+	{
+		processedSampleCount = SPU_DefaultPostProcessSamples(postProcessBuffer, freeSampleCount, synchmode, synchronizer);
+	}
+	
+	soundProcessor->UpdateAudio(postProcessBuffer, processedSampleCount);
+	WAV_WavSoundUpdate(postProcessBuffer, processedSampleCount, WAVMODE_USER);
+}
 
-	// Check to see how much free space there is
-	// If there is some, fill up the buffer
-	if(!SNDCore) return;
-	audiosize = SNDCore->GetAudioSpace();
+void SPU_DefaultFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer)
+{
+	if (synchMode == ESynchMode_Synchronous)
+	{
+		theSynchronizer->enqueue_samples(sampleBuffer, sampleCount);
+	}
+}
 
-	if (audiosize > 0)
+size_t SPU_DefaultPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer)
+{
+	size_t processedSampleCount = 0;
+	
+	switch (synchMode)
 	{
-		//printf("mix %i samples\n", audiosize);
-		if (audiosize > buffersize)
-			audiosize = buffersize;
-
-		s16* outbuf;
-		int samplesOutput;
-		if(synchmode == ESynchMode_Synchronous)
-		{
-			static std::vector<s16> tempbuf;
-			if(tempbuf.size() < audiosize*2) tempbuf.resize(audiosize*2);
-			outbuf = &tempbuf[0];
-			samplesOutput = synchronizer->output_samples(outbuf, audiosize);
-		}
-		else if(SPU_user != NULL)
-		{
-			outbuf = SPU_user->outbuf;
-			samplesOutput = (SPU_MixAudio(mix,SPU_user,audiosize), audiosize);
-		}
-		else return;
-
-		SNDCore->UpdateAudio(outbuf, samplesOutput);
-		WAV_WavSoundUpdate(outbuf, samplesOutput, WAVMODE_USER);
+		case ESynchMode_DualSynchAsynch:
+			if(SPU_user != NULL)
+			{
+				SPU_MixAudio(true, SPU_user, requestedSampleCount);
+				memcpy(postProcessBuffer, SPU_user->outbuf, requestedSampleCount * 2 * sizeof(s16));
+				processedSampleCount = requestedSampleCount;
+			}
+			break;
+			
+		case ESynchMode_Synchronous:
+			processedSampleCount = theSynchronizer->output_samples(postProcessBuffer, requestedSampleCount);
+			break;
+			
+		default:
+			break;
 	}
+	
+	return processedSampleCount;
 }
 
 //////////////////////////////////////////////////////////////////////////////
@@ -1448,6 +1512,9 @@
 void SNDDummyMuteAudio();
 void SNDDummyUnMuteAudio();
 void SNDDummySetVolume(int volume);
+void SNDDummyClearBuffer();
+void SNDDummyFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+size_t SNDDummyPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
 
 SoundInterface_struct SNDDummy = {
 	SNDCORE_DUMMY,
@@ -1458,7 +1525,10 @@
 	SNDDummyGetAudioSpace,
 	SNDDummyMuteAudio,
 	SNDDummyUnMuteAudio,
-	SNDDummySetVolume
+	SNDDummySetVolume,
+	SNDDummyClearBuffer,
+	SNDDummyFetchSamples,
+	SNDDummyPostProcessSamples
 };
 
 int SNDDummyInit(int buffersize) { return 0; }
@@ -1468,6 +1538,9 @@
 void SNDDummyMuteAudio() {}
 void SNDDummyUnMuteAudio() {}
 void SNDDummySetVolume(int volume) {}
+void SNDDummyClearBuffer() {}
+void SNDDummyFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer) {}
+size_t SNDDummyPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer) { return 0; }
 
 //---------wav writer------------
 

Modified: branches/release_0_9_8/desmume/src/SPU.h
===================================================================
--- branches/release_0_9_8/desmume/src/SPU.h	2012-08-03 06:57:19 UTC (rev 4344)
+++ branches/release_0_9_8/desmume/src/SPU.h	2012-08-03 07:00:19 UTC (rev 4345)
@@ -25,6 +25,7 @@
 #include "types.h"
 #include "matrix.h"
 #include "emufile.h"
+#include "metaspu/metaspu.h"
 
 
 #define SNDCORE_DEFAULT         -1
@@ -60,6 +61,8 @@
    void (*UnMuteAudio)();
    void (*SetVolume)(int volume);
    void (*ClearBuffer)();
+	void (*FetchSamples)(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+	size_t (*PostProcessSamples)(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
 };
 
 extern SoundInterface_struct SNDDummy;
@@ -212,6 +215,8 @@
 u32 SPU_ReadLong(u32 addr);
 void SPU_Emulate_core(void);
 void SPU_Emulate_user(bool mix = true);
+void SPU_DefaultFetchSamples(s16 *sampleBuffer, size_t sampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
+size_t SPU_DefaultPostProcessSamples(s16 *postProcessBuffer, size_t requestedSampleCount, ESynchMode synchMode, ISynchronizingAudioBuffer *theSynchronizer);
 
 extern SPU_struct *SPU_core, *SPU_user;
 extern int spu_core_samples;

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

Revision: 4387
          http://desmume.svn.sourceforge.net/desmume/?rev=4387&view=rev
Author:   gocha
Date:     2012-08-28 15:08:52 +0000 (Tue, 28 Aug 2012)
Log Message:
-----------
0.9.8: rasterize: fix pixel poly regression at r3954

Revision Links:
--------------
    http://desmume.svn.sourceforge.net/desmume/?rev=3954&view=rev

Modified Paths:
--------------
    branches/release_0_9_8/desmume/src/gfx3d.cpp
    branches/release_0_9_8/desmume/src/gfx3d.h
    branches/release_0_9_8/desmume/src/rasterize.cpp

Modified: branches/release_0_9_8/desmume/src/gfx3d.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/gfx3d.cpp	2012-08-28 15:06:30 UTC (rev 4386)
+++ branches/release_0_9_8/desmume/src/gfx3d.cpp	2012-08-28 15:08:52 UTC (rev 4387)
@@ -143,7 +143,7 @@
 			commandCursor = 0;
 			size = 0;
 
-			// A \x93command without parameters\x94 is one of the four following commands:
+			// A "command without parameters" is one of the four following commands:
 			// - PushMatrix
 			// - LoadIdentity
 			// - End
@@ -2833,71 +2833,3 @@
 
 }
 #endif
-
-// "Workaround" for line poly
-bool gfx3d_IsLinePoly(POLY *poly)
-{
-	if(!CommonSettings.GFX3D_LineHack) return false;
-
-	int type = poly->type;
-	VERT *vert1, *vert2;
-
-	if (type <= 2)
-		return true;
-	else if (type > 10)
-		return false;
-
-	// Method 1:
-	// Castlevania Portrait of Ruin - trajectory of ricochet
-	bool duplicatedVert[10];
-	for(int i = 0; i < type; i++)
-		duplicatedVert[i] = false;
-	for(int i = 0; i < type - 1; i++)
-	{
-		vert1 = &gfx3d.vertlist->list[poly->vertIndexes[i]];
-		for(int j = i + 1; j < type; j++)
-		{
-			vert2 = &gfx3d.vertlist->list[poly->vertIndexes[j]];
-			if (vert1->x == vert2->x && vert1->y == vert2->y
-				//&& vert1->z == vert2->z
-				)
-			{
-				duplicatedVert[j] = true;
-			}
-		}
-	}
-	int vertCount = type;
-	for(int i = 0; i < type; i++)
-	{
-		if (duplicatedVert[i])
-			vertCount--;
-	}
-	if (vertCount <= 2)
-		return true;
-
-	// Method 2:
-	// Castlevania Portrait of Ruin - warp stone
-	bool horizontalLine = true;
-	bool verticalLine = true;
-	vert1 = &gfx3d.vertlist->list[poly->vertIndexes[0]];
-	for(int i = 1; i < type && (horizontalLine || verticalLine); i++)
-	{
-		vert2 = &gfx3d.vertlist->list[poly->vertIndexes[i]];
-		if (vert1->coord[0] != vert2->coord[0])
-		{
-			verticalLine = false;
-		}
-		if (vert1->coord[1] != vert2->coord[1])
-		{
-			horizontalLine = false;
-		}
-
-		//the Z is different, and this method isn't even meant to catch that
-		//if (vert1->coord[2] != vert2->coord[2])
-		//	return false;
-	}
-	if (horizontalLine || verticalLine)
-		return true;
-
-	return false;
-}

Modified: branches/release_0_9_8/desmume/src/gfx3d.h
===================================================================
--- branches/release_0_9_8/desmume/src/gfx3d.h	2012-08-28 15:06:30 UTC (rev 4386)
+++ branches/release_0_9_8/desmume/src/gfx3d.h	2012-08-28 15:08:52 UTC (rev 4387)
@@ -447,6 +447,4 @@
 
 void gfx3d_ClearStack();
 
-bool gfx3d_IsLinePoly(POLY *poly);
-
 #endif //_GFX3D_H_

Modified: branches/release_0_9_8/desmume/src/rasterize.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/rasterize.cpp	2012-08-28 15:06:30 UTC (rev 4386)
+++ branches/release_0_9_8/desmume/src/rasterize.cpp	2012-08-28 15:08:52 UTC (rev 4387)
@@ -200,6 +200,11 @@
 		float curr, step, stepExtra;
 		FORCEINLINE void doStep() { curr += step; }
 		FORCEINLINE void doStepExtra() { curr += stepExtra; }
+		FORCEINLINE void initialize(float value) {
+			curr = value;
+			step = 0;
+			stepExtra = 0;
+		}
 		FORCEINLINE void initialize(float top, float bottom, float dx, float dy, long XStep, float XPrestep, float YPrestep) {
 			dx = 0;
 			dy *= (bottom-top);
@@ -265,8 +270,18 @@
 	}
 	else
 	{
-		memset(this, 0, sizeof(*this));
-		this->verts = verts;
+		// even if Width == 0 && Height == 0, give some info for pixel poly
+		// example: Castlevania Portrait of Ruin, warp stone
+		XStep = 1;
+		Numerator = 0;
+		Denominator = 1;
+		ErrorTerm = 0;
+		invw.initialize(1/verts[Top]->w);
+		u.initialize(verts[Top]->u);
+		v.initialize(verts[Top]->v);
+		z.initialize(verts[Top]->z);
+		for(int i=0;i<3;i++)
+			color[i].initialize(verts[Top]->fcolor[i]);
 	}
 }
 
@@ -1045,7 +1060,7 @@
 
 			polyAttr.backfacing = engine->polyBackfacing[i];
 
-			shape_engine<SLI>(type,!polyAttr.backfacing, gfx3d_IsLinePoly(poly));
+			shape_engine<SLI>(type,!polyAttr.backfacing, (poly->vtxFormat & 4) && CommonSettings.GFX3D_LineHack);
 		}
 	}
 

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

Revision: 4389
          http://desmume.svn.sourceforge.net/desmume/?rev=4389&view=rev
Author:   gocha
Date:     2012-08-29 23:13:43 +0000 (Wed, 29 Aug 2012)
Log Message:
-----------
0.9.8: fix to load StylusJitter setting on startup

Modified Paths:
--------------
    branches/release_0_9_8/desmume/src/NDSSystem.h
    branches/release_0_9_8/desmume/src/windows/main.cpp

Modified: branches/release_0_9_8/desmume/src/NDSSystem.h
===================================================================
--- branches/release_0_9_8/desmume/src/NDSSystem.h	2012-08-28 23:33:37 UTC (rev 4388)
+++ branches/release_0_9_8/desmume/src/NDSSystem.h	2012-08-29 23:13:43 UTC (rev 4389)
@@ -508,7 +508,7 @@
 		, spu_advanced(false)
 		, StylusPressure(50)
 		, ConsoleType(NDS_CONSOLE_TYPE_FAT)
-		, StylusJitter(true)
+		, StylusJitter(false)
 	{
 		strcpy(ARM9BIOS, "biosnds9.bin");
 		strcpy(ARM7BIOS, "biosnds7.bin");

Modified: branches/release_0_9_8/desmume/src/windows/main.cpp
===================================================================
--- branches/release_0_9_8/desmume/src/windows/main.cpp	2012-08-28 23:33:37 UTC (rev 4388)
+++ branches/release_0_9_8/desmume/src/windows/main.cpp	2012-08-29 23:13:43 UTC (rev 4389)
@@ -2636,6 +2636,7 @@
 	CommonSettings.showGpu.sub = GetPrivateProfileInt("Display", "SubGpu", 1, IniName) != 0;
 	CommonSettings.spu_advanced = GetPrivateProfileBool("Sound", "SpuAdvanced", false, IniName);
 	CommonSettings.advanced_timing = GetPrivateProfileBool("Emulation", "AdvancedTiming", true, IniName);
+	CommonSettings.StylusJitter = GetPrivateProfileBool("Emulation", "StylusJitter", false, IniName);
 
 	CommonSettings.GFX3D_Zelda_Shadow_Depth_Hack = GetPrivateProfileInt("3D", "ZeldaShadowDepthHack", 0, IniName);
 		

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