Make triangle noise removal adjustable

Author: negativeExponent

libretro/libretro.c

@@ -1348,6 +1348,13 @@ static void check_variables(bool startup) {
 		FCEUI_SetLowPass(lowpass);
 	}
 
+	var.key = "fceumm_next_removetrianglenoise";
+
+	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {
+		bool newval = (!strcmp(var.value, "enabled"));
+		FCEUI_RemoveTringleNoise(newval);
+	}
+
 	var.key = "fceumm_next_reducedmcpopping";
 
 	if (environ_cb(RETRO_ENVIRONMENT_GET_VARIABLE, &var) && var.value) {

libretro/libretro_core_options.h

@@ -458,6 +458,20 @@ struct retro_core_option_v2_definition option_defs[] = {
       },
       "disabled",
    },
+   {
+      "fceumm_next_removetrianglenoise",
+      "Remove Triangle Noise",
+      NULL,
+      "Remove tringle channel ultrasonic frequencies.",
+      NULL,
+      "audio",
+      {
+         { "disabled", NULL },
+         { "enabled", NULL },
+         { NULL, NULL },
+      },
+      "disabled",
+   },
    {
       "fceumm_next_reducedmcpopping",
       "Reduce DMC Popping",

src/driver.h

@@ -165,6 +165,8 @@ void FCEUI_GetIVectors(uint16 *reset, uint16 *irq, uint16 *nmi);
 #endif
 
 void FCEUI_SetLowPass(int q);
+
+void FCEUI_RemoveTringleNoise(int d);
 void FCEUI_ReduceDmcPopping(int d);
 void FCEUI_ReverseDMCBitOrder(int d);
 

src/fceu.h

@@ -101,6 +101,7 @@ typedef struct {
 	int ReplaceP2StartWithMicrophone;
 	int PPUOverclockEnabled;
 	int SkipDMC7BitOverclock;
+	int RemoveTriangleNoise;
 	int ReduceDMCPopping;
 	int ReverseDMCBitOrder;
 	int VRC7ToneType; /*0: mapper dependenr, 1: 2413 2: vrcc7 3: 281B */

src/sound.c

@@ -34,6 +34,7 @@
 #include "cart.h"
 #include "nsf.h"
 #include "apu.h"
+#include "driver.h"
 
 static uint32 square_mix_table[32]; /* square channel mix table */
 static uint32 tnd_mix_table[203];   /* triangle/noise/dmc channel mix table */
@@ -880,7 +881,7 @@ static void RDoTriangle(void) {
 	triout = GetOutput(SND_TRIANGLE, TriangleOutput());
 	triout = (triout << TRINPCM_SHIFT) & (~0xFFFF);
 
-	if ((triangle.length.counter == 0) || (triangle.linearCounter == 0) || triangle.timer.period <= 4) {
+	if ((triangle.length.counter == 0) || (triangle.linearCounter == 0) || (FSettings.RemoveTriangleNoise && (triangle.timer.period <= 4))) {
 		/* Counter is halted, but we still need to output. */
 		for (V = triangle.timer.cvbc; V < SOUNDTS; V++) {
 			WaveHi[V] += triout;
@@ -926,7 +927,7 @@ static void RDoTriangleNoisePCMLQ(void) {
 
 	/* setup triangle params */
 	freq[0] = (triangle.timer.period + 1) << 17;
-	if ((triangle.length.counter == 0) || (triangle.linearCounter == 0) || (triangle.timer.period <= 4)) {
+	if ((triangle.length.counter == 0) || (triangle.linearCounter == 0) || (FSettings.RemoveTriangleNoise && (triangle.timer.period <= 4))) {
 		inie[0] = 0;
 	}
 
@@ -1248,11 +1249,15 @@ void FCEUI_SetSoundQuality(int quality) {
 }
 
 void FCEUI_ReduceDmcPopping(int d) {
-	FSettings.ReduceDMCPopping = d;
+	FSettings.ReduceDMCPopping = d ? TRUE : FALSE;
 }
 
 void FCEUI_ReverseDMCBitOrder(int d) {
-	FSettings.ReverseDMCBitOrder = d;
+	FSettings.ReverseDMCBitOrder = d ? TRUE : FALSE;
+}
+
+void FCEUI_RemoveTringleNoise(int d) {
+	FSettings.RemoveTriangleNoise = d ? TRUE : FALSE;
 }
 
 void FCEUI_SetSoundVolume(int channel, int volume) {