SPU: Logic re-write

TASEmulators · Oct 5, 2022 · 2bb2802 · 2bb2802
1 parent b6da15a
commit 2bb2802
Show file tree

Hide file tree

Showing 5 changed files with 764 additions and 553 deletions.
diff --git a/desmume/src/NDSSystem.cpp b/desmume/src/NDSSystem.cpp
@@ -1422,9 +1422,12 @@ static void execHardware_hblank()
 
 	//emulation housekeeping. for some reason we always do this at hblank,
 	//even though it sounds more reasonable to do it at hstart
-	SPU_Emulate_core();
-	driver->AVI_SoundUpdate(SPU_core->outbuf,spu_core_samples);
-	WAV_WavSoundUpdate(SPU_core->outbuf,spu_core_samples);
+	int coreSamples = SPU_Emulate_core(355*6); // HLine = 355 dots @ 6c/dot
+	if(coreSamples)
+	{
+		driver->AVI_SoundUpdate(SPU_core->outbuf,coreSamples);
+		WAV_WavSoundUpdate(SPU_core->outbuf,coreSamples);
+	}
 }
 
 static void execHardware_hstart_vblankEnd()

diff --git a/desmume/src/NDSSystem.h b/desmume/src/NDSSystem.h
@@ -530,6 +530,7 @@ extern struct TCommonSettings
 		, spuInterpolationMode(2)
 		, manualBackupType(0)
 		, autodetectBackupMethod(0)
+		, spu_muteChannels(0)
 		, spu_captureMuted(false)
 		, spu_advanced(true)
 		, StylusPressure(50)
@@ -543,9 +544,6 @@ extern struct TCommonSettings
 		strcpy(ARM7BIOS, "biosnds7.bin");
 		strcpy(ExtFirmwarePath, "firmware.bin");
 
-		for(int i=0;i<16;i++)
-			spu_muteChannels[i] = false;
-
 		for(int g=0;g<2;g++)
 			for(int x=0;x<5;x++)
 				dispLayers[g][x]=true;
@@ -652,7 +650,7 @@ extern struct TCommonSettings
 	int SPU_sync_mode;
 	int SPU_sync_method;
 
-	bool spu_muteChannels[16];
+	u16  spu_muteChannels;
 	bool spu_captureMuted;
 	bool spu_advanced;