From fb087688d7de53688962f8ed888f385f3066acc9 Mon Sep 17 00:00:00 2001
From: Jeffrey Pfau <jeffrey@endrift.com>
Date: Sat, 13 Feb 2016 00:55:23 -0800
Subject: [PATCH] GB Audio: Channel 3 cleanup

---
 src/gb/audio.c | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/src/gb/audio.c b/src/gb/audio.c
index cf36c032d..c3f24a50a 100644
--- a/src/gb/audio.c
+++ b/src/gb/audio.c
@@ -231,8 +231,7 @@ void GBAudioWriteNR30(struct GBAudio* audio, uint8_t value) {
 }
 
 void GBAudioWriteNR31(struct GBAudio* audio, uint8_t value) {
-	audio->ch3.length = value;
-	audio->ch3.lengthShadow = 256 - value;
+	audio->ch3.length = 256 - value;
 }
 
 void GBAudioWriteNR32(struct GBAudio* audio, uint8_t value) {
@@ -249,18 +248,18 @@ void GBAudioWriteNR34(struct GBAudio* audio, uint8_t value) {
 	audio->ch3.rate |= GBAudioRegisterControlGetRate(value << 8);
 	bool wasStop = audio->ch3.stop;
 	audio->ch3.stop = GBAudioRegisterControlGetStop(value << 8);
-	if (!wasStop && audio->ch3.stop && audio->ch3.lengthShadow && !(audio->frame & 1)) {
-		--audio->ch3.lengthShadow;
-		if (audio->ch3.lengthShadow == 0) {
+	if (!wasStop && audio->ch3.stop && audio->ch3.length && !(audio->frame & 1)) {
+		--audio->ch3.length;
+		if (audio->ch3.length == 0) {
 			audio->playingCh3 = false;
 		}
 	}
 	if (GBAudioRegisterControlIsRestart(value << 8)) {
 		audio->playingCh3 = audio->ch3.enable;
-		if (!audio->ch3.lengthShadow) {
-			audio->ch3.lengthShadow = 256;
+		if (!audio->ch3.length) {
+			audio->ch3.length = 256;
 			if (audio->ch3.stop && !(audio->frame & 1)) {
-				--audio->ch3.lengthShadow;
+				--audio->ch3.length;
 			}
 		}
 	}
@@ -504,9 +503,9 @@ int32_t GBAudioProcessEvents(struct GBAudio* audio, int32_t cycles) {
 				}
 			}
 
-			if (audio->ch3.lengthShadow && audio->ch3.stop && !(frame & 1)) {
-				--audio->ch3.lengthShadow;
-				if (audio->ch3.lengthShadow == 0) {
+			if (audio->ch3.length && audio->ch3.stop && !(frame & 1)) {
+				--audio->ch3.length;
+				if (audio->ch3.length == 0) {
 					audio->playingCh3 = 0;
 				}
 			}