From ab6d5cbdeee27740f20b32a0cc0d16391df371d7 Mon Sep 17 00:00:00 2001
From: twobit <twobit@lavabit.com>
Date: Wed, 8 Aug 2012 20:37:49 +0200
Subject: [PATCH] better tune, maybe

---
 synth/simple.tune | 157 +++++++++++++++++++++++++++++++++-------------
 synth/synth.h     |   4 +-
 2 files changed, 117 insertions(+), 44 deletions(-)

diff --git a/synth/simple.tune b/synth/simple.tune
index c5a17bc..10dc44f 100644
--- a/synth/simple.tune
+++ b/synth/simple.tune
@@ -2,6 +2,7 @@
 
 
 bass
+	250 1
 	0 1
 	255 255
 
@@ -21,11 +22,10 @@ pad01
 
 
 kick
-	0 3
-	0 1
-	254 1
-	248 1
-	244 1
+	255 1
+	251 1
+	246 1
+	242 1
 	0 255
 	255 255
 
@@ -38,27 +38,31 @@ snare
 	0 3
 	255 255
 
-hat
-	0 3
+lead
+	0 2
 	255 255
 
+lead_
+	255 2
+	0 2
+	255 255
 
 
 [INSTRUMENTS]
 
-bass	32768	10	0	bass
+bass	32768	10	4	bass
 
 pad00	32768	10	3	pad00
 pad01	32768	10	3	pad01
 
 kick	32768	0	3	kick
-snare	32768	0	10	snare
-hat		0		0	40	hat
+snare	30000	0	10	snare
 
+lead	1000	255	1	lead
+lead_	1000	255	1	lead_
 
 [PATTERNS]
-
-empty
+---
 	.
 	.
 	.
@@ -79,15 +83,15 @@ empty
 drum00
 	g_3	kick
 	.
-	g_3 hat
 	.
+	g_3	kick
 	d_4	snare
 	.
 	g_3	kick
 	.
-	g_3 hat
 	.
-	g_3 hat
+	.
+	.
 	.
 	d_4	snare
 	.
@@ -97,68 +101,68 @@ drum00
 drum01
 	g_3	kick
 	.
-	g_3 hat
 	.
+	g_3	kick
 	d_4	snare
 	.
 	g_3	kick
 	.
-	g_3 hat
 	.
-	g_3 hat
+	.
+	.
 	.
 	d_4	snare
 	.
-	g_3 hat
+	.
 	.
 
 drum02
 	g_3	kick
 	.
-	g_3 hat
 	.
+	g_3	kick
 	d_4	snare
 	.
 	g_3	kick
 	.
-	d_4	snare
+	.
 	.
 	g_3	kick
 	.
 	d_4	snare
 	.
 	d_4	snare
-	.
+	d_4	snare
 
 bass00
 	c_3	bass
-	-
+	---
 	c_5	pad00
 	c_3	bass
-	-
+	---
 	.
-	c_3
-	-
-	c_3
-	-
+	c_3 bass
+	d#5	pad01
+	c_3 bass
+	---
 	.
 	.
 	a#4	pad01
 	.
 	c_4 bass
-	-
+	c_4 bass
 
 bass01
 	c_3	bass
-	-
+	---
 	c_5	pad00
 	c_3	bass
-	-
+	---
 	.
 	c_3
-	-
+	---
 	c_3
-	-
+	---
 	.
 	.
 	a#4	pad01
@@ -166,15 +170,84 @@ bass01
 	.
 	.
 
+
+lead00
+	.
+	.
+	g_5 lead
+	---
+	g_5 lead_
+	.
+	.
+	.
+	---
+	.
+	f_5 lead
+	d#5
+	f_5
+	d#5
+	f_5
+	g_5
+
+lead01
+	f_5 lead
+	c_5
+	---
+	c_5
+	.
+	.
+	---
+	c_5
+	d#5
+	c_5
+	f_5
+	c_5
+	g_5
+	d#5
+	a#5
+	c_6 lead_
+
+lead02
+	.
+	.
+	g_5 lead
+	---
+	g_5 lead_
+	.
+	.
+	.
+	---
+	.
+	f_5 lead
+	d#5
+	f_5 lead_
+	d#5 lead
+	a#4
+	c_5
+
+
 [PATTERNTABLE]
-empty		bass00		empty
-empty		bass00		empty
-empty		bass00		empty
-empty		bass01		empty
-
-drum00		bass00		empty
-drum01		bass00		empty
-drum00		bass00		empty
-drum02		bass01		empty
+
+
+---			bass00		---
+---			bass01		---
+---			bass00		---
+---			bass01		---
+
+---			bass00		lead00
+---			bass01		lead01
+---			bass00		lead02
+---			bass01		---
+
+drum00		bass00		lead00
+drum01		bass01		lead01
+drum00		bass00		lead02
+drum02		bass01		---
+
+drum00		bass00		lead00
+drum01		bass01		lead01
+drum00		bass00		lead02
+drum02		bass01		---
+
 
 
diff --git a/synth/synth.h b/synth/synth.h
index c43e08f..b094fb3 100644
--- a/synth/synth.h
+++ b/synth/synth.h
@@ -25,8 +25,8 @@ uint16_t synth_mix(void);
 
 enum {
 	channel_count = 3,
-	tick_length = 500,
-	row_length = 4,
+	tick_length = 400,
+	row_length = 8,
 	pattern_length = 16
 };