Refactor code

1 files changed, 22 insertions, 11 deletions

diff --git a/music.scm b/music.scm
index 0c35ee1..7934bda 100644
--- a/music.scm
+++ b/music.scm
@@ -1,19 +1,30 @@
 (include "lib.scm")
 
 (define (melody t) (
-	apply + (map
-		(lambda (octave pitch start len) ((note (getfreq octave pitch) start len) t))
-		;'(3)
-		;(cons (* 3 (sin t)) '())
-		;'(0)
-		;'(6.28)
-		'(3 3 3 3 3 3 3 3 3 3)
-		'(4 8 4 11 4 2 8 4 11 4)
-		'(0 1/4 3/4 1 5/4 3/2 7/4 9/4 5/2 11/4)
-		'(1/4 1/4 1/4 1/4 1/4 1/4 1/4 1/4 1/4 1/4)
+	apply + (
+		map (lambda (x) (
+			apply (lambda (octave pitch start len) ((note (getfreq octave pitch) start len) t)) x
+		)) '(
+			(2 5 1 1)
+			(2 8 4 1)
+			(3 5 7 1)
+			(3 0 9 1)
+			(2 10 10 1)
+			(2 8 12 1)
+			(2 7 15 1)
+			(2 8 17 1)
+			(2 7 18 1)
+			(3 3 19 1)
+			(2 8 21 1)
+			(3 0 22 1)
+			(3 3 23 1)
+			(3 5 25 1)
+			(3 0 30 1)
+			(3 3 31 1)
+		)
 	)
 ))
 
 (define (music t) (
-	melody (floor-remainder t 3)
+	melody (* t 8)
 ))