From 501ccafc2b838516202367911c4da0c6b91935d8 Mon Sep 17 00:00:00 2001
From: dinkc64 <12570148+dinkc64@users.noreply.github.com>
Date: Fri, 14 Nov 2014 20:07:40 +0000
Subject: [PATCH] Black Tiger: Lower SFX volume so the music can be heard
 better, add BurnYM2203SetPSGVolume macro to burn_ym2203.h, un-duplificate
 some code in d_ninjakd2.cpp & d_tigeroad.cpp w/new macro.

---
 src/burn/drv/pre90s/d_blktiger.cpp |  2 ++
 src/burn/drv/pre90s/d_ninjakd2.cpp | 19 ++++++-------------
 src/burn/drv/pre90s/d_tigeroad.cpp | 16 ++++------------
 src/burn/snd/burn_ym2203.h         |  5 +++++
 4 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/src/burn/drv/pre90s/d_blktiger.cpp b/src/burn/drv/pre90s/d_blktiger.cpp
index 1fa2902a7..dc0cda76f 100644
--- a/src/burn/drv/pre90s/d_blktiger.cpp
+++ b/src/burn/drv/pre90s/d_blktiger.cpp
@@ -535,6 +535,8 @@ static INT32 DrvInit()
 	BurnTimerAttachZet(3579545);
 	BurnYM2203SetAllRoutes(0, 0.15, BURN_SND_ROUTE_BOTH);
 	BurnYM2203SetAllRoutes(1, 0.15, BURN_SND_ROUTE_BOTH);
+	BurnYM2203SetPSGVolume(0, 0.05);
+	BurnYM2203SetPSGVolume(1, 0.05);
 
 	DrvDoReset(1);
 
diff --git a/src/burn/drv/pre90s/d_ninjakd2.cpp b/src/burn/drv/pre90s/d_ninjakd2.cpp
index ff057fd0b..b2b95c0b0 100644
--- a/src/burn/drv/pre90s/d_ninjakd2.cpp
+++ b/src/burn/drv/pre90s/d_ninjakd2.cpp
@@ -1094,16 +1094,6 @@ static void ninjakd2_sound_init()
 	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_3, 0.50, BURN_SND_ROUTE_BOTH);
 }
 
-static void lower_psg_volume(double voll)
-{
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_1, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_2, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_3, voll, BURN_SND_ROUTE_BOTH);
-}
-
 static INT32 DrvDoReset()
 {
 	memset(AllRam, 0, RamEnd - AllRam);
@@ -1373,7 +1363,8 @@ static INT32 MnightInit()
 	ZetClose();
 
 	ninjakd2_sound_init();
-	lower_psg_volume(0.05);
+	BurnYM2203SetPSGVolume(0, 0.05);
+	BurnYM2203SetPSGVolume(1, 0.05);
 
 	GenericTilesInit();
 
@@ -1455,7 +1446,8 @@ static INT32 RobokidInit()
 	ZetClose();
 
 	ninjakd2_sound_init();
-	lower_psg_volume(0.03);
+	BurnYM2203SetPSGVolume(0, 0.03);
+	BurnYM2203SetPSGVolume(1, 0.03);
 
 	GenericTilesInit();
 
@@ -1514,7 +1506,8 @@ static INT32 OmegafInit()
 	ZetClose();
 
 	ninjakd2_sound_init();
-	lower_psg_volume(0.03);
+	BurnYM2203SetPSGVolume(0, 0.03);
+	BurnYM2203SetPSGVolume(1, 0.03);
 
 	GenericTilesInit();
 
diff --git a/src/burn/drv/pre90s/d_tigeroad.cpp b/src/burn/drv/pre90s/d_tigeroad.cpp
index 6686a6205..7fca1be4a 100644
--- a/src/burn/drv/pre90s/d_tigeroad.cpp
+++ b/src/burn/drv/pre90s/d_tigeroad.cpp
@@ -675,16 +675,6 @@ static INT32 DrvGfxDecode()
 	return 0;
 }
 
-static void lower_psg_volume(double voll)
-{
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_1, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_1, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_2, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_2, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(0, BURN_SND_YM2203_AY8910_ROUTE_3, voll, BURN_SND_ROUTE_BOTH);
-	BurnYM2203SetRoute(1, BURN_SND_YM2203_AY8910_ROUTE_3, voll, BURN_SND_ROUTE_BOTH);
-}
-
 static INT32 DrvInit(INT32 (*pInitCallback)())
 {
 	AllMem = NULL;
@@ -741,8 +731,10 @@ static INT32 DrvInit(INT32 (*pInitCallback)())
 	BurnYM2203SetAllRoutes(0, 0.25, BURN_SND_ROUTE_BOTH);
 	BurnYM2203SetAllRoutes(1, 0.25, BURN_SND_ROUTE_BOTH);
 
-	if (nF1dream)
-		lower_psg_volume(0.11);
+	if (nF1dream) {
+		BurnYM2203SetPSGVolume(0, 0.11);
+		BurnYM2203SetPSGVolume(1, 0.11);
+	}
 
 	if (toramich) {
 		MSM5205Init(0, DrvMSM5205SynchroniseStream, 384000, NULL, MSM5205_SEX_4B, 1);
diff --git a/src/burn/snd/burn_ym2203.h b/src/burn/snd/burn_ym2203.h
index d7cb68c5b..b8051660e 100644
--- a/src/burn/snd/burn_ym2203.h
+++ b/src/burn/snd/burn_ym2203.h
@@ -30,6 +30,11 @@ extern INT32 bYM2203UseSeperateVolumes;
 	BurnYM2203SetRoute(i, BURN_SND_YM2203_AY8910_ROUTE_2, v, d);	\
 	BurnYM2203SetRoute(i, BURN_SND_YM2203_AY8910_ROUTE_3, v, d)
 
+#define BurnYM2203SetPSGVolume(i, v) \
+	BurnYM2203SetRoute(i, BURN_SND_YM2203_AY8910_ROUTE_1, v, BURN_SND_ROUTE_BOTH); \
+	BurnYM2203SetRoute(i, BURN_SND_YM2203_AY8910_ROUTE_2, v, BURN_SND_ROUTE_BOTH); \
+	BurnYM2203SetRoute(i, BURN_SND_YM2203_AY8910_ROUTE_3, v, BURN_SND_ROUTE_BOTH);
+
 #define BurnYM2203Read(i, a) YM2203Read(i, a)
 
 #if defined FBA_DEBUG