From 14b791164d9f402f31138c400610676d1cdd5c04 Mon Sep 17 00:00:00 2001
From: Vince Weaver <vince@deater.net>
Date: Sun, 18 Feb 2018 22:21:09 -0500
Subject: [PATCH] chiptune: actually have the volume bars hooked up

---
 chiptune_player/chiptune_player.s | 65 +++++++++++++++++++++++--------
 1 file changed, 48 insertions(+), 17 deletions(-)

diff --git a/chiptune_player/chiptune_player.s b/chiptune_player/chiptune_player.s
index a762668a..7a289a39 100644
--- a/chiptune_player/chiptune_player.s
+++ b/chiptune_player/chiptune_player.s
@@ -117,19 +117,10 @@ mockingboard_found:
 	jsr	load_rle_gr
 
 	;===========================
-	; init pointer to the music
+	; load first song
 	;===========================
 
-	jsr	read_file
-
-	lda	#>CHUNK_BUFFER
-	sta	INH
-	lda	#<CHUNK_BUFFER
-	sta	INL
-
-	lda	#$0
-	sta	MB_CHUNK
-
+	jsr	new_song
 
 	;============================
 	; Enable 6502 interrupts
@@ -224,6 +215,22 @@ mb_write_loop:
 
 mb_not_13:
 	sta	MB_VALUE
+
+	cpx	#8
+	bne	mb_not_8
+	and	#$f
+	sta	A_VOLUME
+mb_not_8:
+	cpx	#9
+	bne	mb_not_9
+	and	#$f
+	sta	B_VOLUME
+mb_not_9:
+	cpx	#10
+	bne	mb_not_10
+	and	#$f
+	sta	C_VOLUME
+mb_not_10:
 					; INLINE?
 	jsr	write_ay_both		; assume 3 channel (not six)
 					; so write same to both left/write
@@ -268,12 +275,6 @@ done_interrupt:
 
 volume_bars:
 
-	lda	#15
-	sta	A_VOLUME
-	lda	#7
-	sta	B_VOLUME
-	lda	#3
-	sta	C_VOLUME
 
 			; hline Y,V2 at A
 
@@ -487,7 +488,37 @@ bottom_line:
 	rts
 
 
+	;=================
+	; load a new song
+	;=================
 
+new_song:
+	lda	#0
+	sta	A_VOLUME
+	lda	#0
+	sta	B_VOLUME
+	lda	#0
+	sta	C_VOLUME
+
+	;===========================
+	; init pointer to the music
+	;===========================
+
+
+	jsr	read_file
+
+	lda	#>CHUNK_BUFFER
+	sta	INH
+	lda	#<CHUNK_BUFFER
+	sta	INL
+
+	lda	#$0
+	sta	MB_CHUNK
+
+
+
+
+	rts
 ;=========
 ;routines
 ;=========