merge preamp circuits

5 files changed, 725 insertions, 636 deletions

diff --git a/gschem/board.pcb b/gschem/board.pcb
index 3dc9838..63b1d35 100644
--- a/gschem/board.pcb
+++ b/gschem/board.pcb
@@ -6,7 +6,7 @@ FileVersion[20070407]
 PCB["" 354331 425197]
 
 Grid[2500.0 0 0 0]
-Cursor[317500 177500 0.000000]
+Cursor[210000 85000 0.000000]
 PolyArea[3100.006200]
 Thermal[0.500000]
 DRC[1000 1000 1000 1000 1500 1000]
@@ -1268,29 +1268,6 @@ Element["" "R025" "R305" "5M1" 310000 345000 2000 12000 3 100 ""]
 
 	)
 
-Element["" "TO92" "Q301" "unknown" 267500 330000 1000 -13000 0 100 ""]
-(
-	Pin[20000 0 7200 3000 7800 4200 "D" "1" "square,edge2"]
-	Pin[10000 0 7200 3000 7800 4200 "S" "2" "edge2"]
-	Pin[0 0 7200 3000 7800 4200 "G" "3" "edge2"]
-	ElementLine [3000 -7000 17000 -7000 1000]
-	ElementArc [10000 0 10000 10000 315 270 1000]
-
-	)
-
-Element["" "R025" "R308" "4k7" 235000 310000 12000 -2000 0 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,edge2,thermal(1X)"]
-	Pin[40000 0 6800 3000 7400 3800 "2" "2" "edge2"]
-	ElementLine [10000 -5000 30000 -5000 2000]
-	ElementLine [30000 -5000 30000 5000 2000]
-	ElementLine [10000 5000 30000 5000 2000]
-	ElementLine [10000 -5000 10000 5000 2000]
-	ElementLine [0 0 10000 0 2000]
-	ElementLine [30000 0 40000 0 2000]
-
-	)
-
 Element["" "TO92" "Q302" "unknown" 305000 335000 -13000 -1000 1 100 ""]
 (
 	Pin[0 -20000 7200 3000 7800 4200 "D" "1" "square"]
@@ -1338,30 +1315,6 @@ Element["" "RCY100P" "C301" "1u" 325000 282500 -15000 10000 2 100 ""]
 
 	)
 
-Element["" "R025" "R311" "100k" 235000 297500 -2000 -12000 1 100 ""]
-(
-	Pin[0 0 6800 3000 7400 3800 "1" "1" "square,thermal(1X)"]
-	Pin[0 -40000 6800 3000 7400 3800 "2" "2" ""]
-	ElementLine [-5000 -30000 -5000 -10000 2000]
-	ElementLine [-5000 -30000 5000 -30000 2000]
-	ElementLine [5000 -30000 5000 -10000 2000]
-	ElementLine [-5000 -10000 5000 -10000 2000]
-	ElementLine [0 -10000 0 0 2000]
-	ElementLine [0 -40000 0 -30000 2000]
-
-	)
-
-Element["" "RCY100P" "C302" "1u" 255000 292500 -10000 -15000 1 100 ""]
-(
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "square"]
-	Pin[0 -10000 6000 3000 6600 3000 "-" "2" ""]
-	ElementLine [0 7000 0 11000 1000]
-	ElementLine [-2000 9000 2000 9000 1000]
-	ElementLine [0 -21000 0 -17000 1000]
-	ElementArc [0 -5000 10000 10000 90 360 1000]
-
-	)
-
 Element["" "R025" "R310" "22k" 272500 297500 -2000 -12000 1 100 ""]
 (
 	Pin[0 0 6800 3000 7400 3800 "1" "1" "square"]
@@ -2199,16 +2152,86 @@ Element["" "RCY100P" "C503" "1u" 294000 190000 15000 -10000 0 100 ""]
 
 	)
 
-Element["selected" "RCY100P" "C502" "1u" 329000 187500 -15000 10000 2 100 "selected"]
+Element["" "RCY100P" "C502" "1u" 329000 187500 -15000 10000 2 100 ""]
 (
-	Pin[0 0 6000 3000 6600 3000 "+" "1" "selected,square,edge2"]
-	Pin[-10000 0 6000 3000 6600 3000 "-" "2" "selected,edge2"]
+	Pin[0 0 6000 3000 6600 3000 "+" "1" "square,edge2"]
+	Pin[-10000 0 6000 3000 6600 3000 "-" "2" "edge2"]
 	ElementLine [7000 0 11000 0 1000]
 	ElementLine [9000 -2000 9000 2000 1000]
 	ElementLine [-21000 0 -17000 0 1000]
 	ElementArc [-5000 0 10000 10000 180 360 1000]
 
 	)
+
+Element["" "CONNECTOR-1-2" "CONN302" "unknown" 200000 15000 21000 -5000 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3800 "1" "1" "square,edge2"]
+	Pin[10000 0 6000 3000 6600 3800 "2" "2" "edge2"]
+	ElementLine [-5000 -5000 -5000 5000 1000]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 5000 15000 -5000 1000]
+	ElementLine [15000 -5000 -5000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 5000 5000 -5000 1000]
+
+	)
+
+Element["" "CONNECTOR-1-2" "CONN301" "unknown" 197500 30000 21000 -5000 3 100 ""]
+(
+	Pin[0 0 6000 3000 6600 3800 "1" "1" "square,edge2"]
+	Pin[10000 0 6000 3000 6600 3800 "2" "2" "edge2"]
+	ElementLine [-5000 -5000 -5000 5000 1000]
+	ElementLine [-5000 5000 15000 5000 1000]
+	ElementLine [15000 5000 15000 -5000 1000]
+	ElementLine [15000 -5000 -5000 -5000 1000]
+	ElementLine [-5000 5000 5000 5000 1000]
+	ElementLine [5000 5000 5000 -5000 1000]
+
+	)
+Rat[197500 30000 1 0 0 1  "via"]
+Rat[142500 210000 1 215000 157500 1  ""]
+Rat[215000 157500 1 245000 167500 1  ""]
+Rat[122500 200000 1 97500 112500 1  ""]
+Rat[97500 112500 1 92500 62500 1  ""]
+Rat[245000 167500 1 295000 65000 1  ""]
+Rat[274000 192500 1 294000 127500 1  ""]
+Rat[304000 190000 1 326500 170000 1  ""]
+Rat[207500 30000 1 295000 345000 1  ""]
+Rat[200000 15000 1 285000 285000 1  ""]
+Rat[245000 157500 1 243500 195000 1  ""]
+Rat[245000 157500 1 281500 167500 1  ""]
+Rat[243500 195000 1 291500 232500 1  ""]
+Rat[274000 182500 1 245000 147500 1  ""]
+Rat[245000 147500 1 281500 127500 1  ""]
+Rat[215000 147500 1 258500 195000 1  ""]
+Rat[258500 195000 1 334000 220000 1  ""]
+Rat[334000 220000 1 326500 130000 1  ""]
+Rat[329000 187500 1 294000 220000 1  ""]
+Rat[294000 220000 1 215000 137500 1  ""]
+Rat[291500 207500 1 262500 140000 1  ""]
+Rat[262500 140000 1 246500 93500 1  ""]
+Rat[319000 187500 1 262500 150000 1  ""]
+Rat[255000 247500 1 258500 235000 1  ""]
+Rat[258500 235000 1 243500 235000 1  ""]
+Rat[265000 55000 1 246500 53500 1  ""]
+Rat[235000 45000 1 225000 60500 1  ""]
+Rat[235000 45000 1 265000 45000 1  ""]
+Rat[265000 45000 1 265000 35000 1  ""]
+Rat[265000 45000 1 272500 95000 1  ""]
+Rat[295000 55000 1 312500 84500 1  ""]
+Rat[312500 84500 1 312500 95000 1  ""]
+Rat[325000 44500 1 312500 44500 1  ""]
+Rat[325000 44500 1 325000 60000 1  ""]
+Rat[312500 44500 1 295000 45000 1  ""]
+Rat[225000 45000 1 230000 19500 1  ""]
+Rat[335000 44500 1 330000 19500 1  ""]
+Rat[215000 360000 1 287500 330000 1  ""]
+Rat[127500 185000 1 62500 97500 1  ""]
+Rat[152500 207500 1 235000 127500 1  ""]
+Rat[235000 122500 1 225000 90500 1  ""]
+Rat[225000 90500 1 286500 78500 1  ""]
+Rat[286500 78500 1 325000 90000 1  ""]
+Rat[286500 78500 1 295000 35000 1  ""]
 Layer(1 "component")
 (
 )
@@ -2506,10 +2529,13 @@ NetList()
 		Connect("C408-2")
 		Connect("C501-2")
 		Connect("C507-2")
+		Connect("CONN301-1")
 		Connect("IC401-4")
 		Connect("IC402-4")
 		Connect("IC501-4")
 		Connect("IC502-4")
+		Connect("K101-5")
+		Connect("K301-5")
 		Connect("R102-1")
 		Connect("R105-2")
 		Connect("R106-2")
@@ -2524,10 +2550,8 @@ NetList()
 		Connect("R302-1")
 		Connect("R305-1")
 		Connect("R307-1")
-		Connect("R308-1")
 		Connect("R309-1")
 		Connect("R310-2")
-		Connect("R311-1")
 		Connect("R418-2")
 		Connect("R419-1")
 		Connect("R420-2")
@@ -2538,9 +2562,7 @@ NetList()
 	)
 	Net("BLEND_1" "(unknown)")
 	(
-		Connect("C302-2")
 		Connect("C504-1")
-		Connect("R311-2")
 	)
 	Net("BLEND_2" "(unknown)")
 	(
@@ -2572,15 +2594,24 @@ NetList()
 	Net("INPUT_1" "(unknown)")
 	(
 		Connect("C203-1")
+		Connect("S101-1")
+		Connect("S101-6")
 	)
 	Net("INPUT_2" "(unknown)")
 	(
 		Connect("C103-1")
+		Connect("S101-3")
+		Connect("S101-4")
 	)
 	Net("JACKSWITCH_B" "(unknown)")
 	(
 		Connect("R508-2")
 	)
+	Net("MELODY_RETURN" "(unknown)")
+	(
+		Connect("CONN302-2")
+		Connect("K301-1")
+	)
 	Net("OUT_A" "(unknown)")
 	(
 		Connect("C508-2")
@@ -2612,11 +2643,6 @@ NetList()
 		Connect("R105-1")
 		Connect("S401-1")
 	)
-	Net("SEND" "(unknown)")
-	(
-		Connect("R309-3")
-		Connect("R310-1")
-	)
 	Net("SEND_HIGH" "(unknown)")
 	(
 		Connect("R420-1")
@@ -2627,11 +2653,6 @@ NetList()
 		Connect("R418-1")
 		Connect("R419-3")
 	)
-	Net("TUNER" "(unknown)")
-	(
-		Connect("R301-1")
-		Connect("R302-3")
-	)
 	Net("unnamed_net1" "(unknown)")
 	(
 		Connect("C101-1")
@@ -2716,179 +2737,200 @@ NetList()
 	)
 	Net("unnamed_net13" "(unknown)")
 	(
+		Connect("K101-4")
+		Connect("S101-2")
+	)
+	Net("unnamed_net14" "(unknown)")
+	(
+		Connect("K101-1")
+		Connect("S101-5")
+	)
+	Net("unnamed_net15" "(unknown)")
+	(
+		Connect("CONN301-2")
+		Connect("R301-1")
+		Connect("R302-3")
+	)
+	Net("unnamed_net16" "(unknown)")
+	(
 		Connect("C305-2")
 		Connect("R302-2")
 	)
-	Net("unnamed_net14" "(unknown)")
+	Net("unnamed_net17" "(unknown)")
 	(
 		Connect("C305-1")
 		Connect("R303-2")
 		Connect("R304-2")
 	)
-	Net("unnamed_net15" "(unknown)")
+	Net("unnamed_net18" "(unknown)")
 	(
 		Connect("C303-2")
-		Connect("Q301-3")
 		Connect("Q302-3")
 		Connect("R303-1")
 		Connect("R305-2")
 		Connect("R306-1")
 	)
-	Net("unnamed_net16" "(unknown)")
+	Net("unnamed_net19" "(unknown)")
 	(
 		Connect("C304-2")
 		Connect("R304-1")
 	)
-	Net("unnamed_net17" "(unknown)")
-	(
-		Connect("C302-1")
-		Connect("Q301-2")
-		Connect("R308-2")
-	)
-	Net("unnamed_net18" "(unknown)")
+	Net("unnamed_net20" "(unknown)")
 	(
 		Connect("C301-1")
 		Connect("Q302-2")
 		Connect("R307-2")
 	)
-	Net("unnamed_net19" "(unknown)")
+	Net("unnamed_net21" "(unknown)")
 	(
 		Connect("C301-2")
 		Connect("R309-2")
 	)
-	Net("unnamed_net20" "(unknown)")
+	Net("unnamed_net22" "(unknown)")
+	(
+		Connect("CONN302-1")
+		Connect("K301-4")
+		Connect("R309-3")
+		Connect("R310-1")
+	)
+	Net("unnamed_net23" "(unknown)")
+	(
+		Connect("K301-2")
+		Connect("K301-3")
+	)
+	Net("unnamed_net24" "(unknown)")
 	(
 		Connect("C403-1")
 		Connect("IC401-3")
 		Connect("R404-1")
 	)
-	Net("unnamed_net21" "(unknown)")
+	Net("unnamed_net25" "(unknown)")
 	(
 		Connect("IC401-2")
 		Connect("R405-1")
 		Connect("R407-2")
 	)
-	Net("unnamed_net22" "(unknown)")
+	Net("unnamed_net26" "(unknown)")
 	(
 		Connect("C406-2")
 		Connect("IC401-5")
 		Connect("R402-2")
 	)
-	Net("unnamed_net23" "(unknown)")
+	Net("unnamed_net27" "(unknown)")
 	(
 		Connect("IC401-6")
 		Connect("R406-1")
 		Connect("R408-2")
 	)
-	Net("unnamed_net24" "(unknown)")
+	Net("unnamed_net28" "(unknown)")
 	(
 		Connect("IC402-2")
 		Connect("R412-1")
 		Connect("R413-1")
 		Connect("R416-2")
 	)
-	Net("unnamed_net25" "(unknown)")
+	Net("unnamed_net29" "(unknown)")
 	(
 		Connect("C410-1")
 		Connect("IC402-1")
 		Connect("R416-1")
 	)
-	Net("unnamed_net26" "(unknown)")
+	Net("unnamed_net30" "(unknown)")
 	(
 		Connect("IC402-6")
 		Connect("R414-1")
 		Connect("R415-1")
 		Connect("R417-2")
 	)
-	Net("unnamed_net27" "(unknown)")
+	Net("unnamed_net31" "(unknown)")
 	(
 		Connect("C409-1")
 		Connect("IC402-7")
 		Connect("R417-1")
 	)
-	Net("unnamed_net28" "(unknown)")
+	Net("unnamed_net32" "(unknown)")
 	(
 		Connect("C401-1")
 		Connect("C402-1")
 		Connect("R401-1")
 	)
-	Net("unnamed_net29" "(unknown)")
+	Net("unnamed_net33" "(unknown)")
 	(
 		Connect("C402-2")
 		Connect("C403-2")
 		Connect("R403-1")
 	)
-	Net("unnamed_net30" "(unknown)")
+	Net("unnamed_net34" "(unknown)")
 	(
 		Connect("C404-2")
 		Connect("R402-1")
 		Connect("R409-2")
 	)
-	Net("unnamed_net31" "(unknown)")
+	Net("unnamed_net35" "(unknown)")
 	(
 		Connect("C405-2")
 		Connect("R409-1")
 		Connect("R410-1")
 	)
-	Net("unnamed_net32" "(unknown)")
+	Net("unnamed_net36" "(unknown)")
 	(
 		Connect("C409-2")
 		Connect("R419-2")
 	)
-	Net("unnamed_net33" "(unknown)")
+	Net("unnamed_net37" "(unknown)")
 	(
 		Connect("C410-2")
 		Connect("R421-2")
 	)
-	Net("unnamed_net34" "(unknown)")
+	Net("unnamed_net38" "(unknown)")
 	(
 		Connect("IC501-6")
 		Connect("R506-1")
 		Connect("R507-2")
 		Connect("R508-1")
 	)
-	Net("unnamed_net35" "(unknown)")
+	Net("unnamed_net39" "(unknown)")
 	(
 		Connect("C508-1")
 		Connect("IC501-7")
 		Connect("R507-1")
 	)
-	Net("unnamed_net36" "(unknown)")
+	Net("unnamed_net40" "(unknown)")
 	(
 		Connect("IC501-2")
 		Connect("R503-1")
 		Connect("R504-1")
 		Connect("R505-2")
 	)
-	Net("unnamed_net37" "(unknown)")
+	Net("unnamed_net41" "(unknown)")
 	(
 		Connect("C502-1")
 		Connect("IC501-1")
 		Connect("R505-1")
 	)
-	Net("unnamed_net38" "(unknown)")
+	Net("unnamed_net42" "(unknown)")
 	(
 		Connect("R501-1")
 		Connect("R502-3")
 		Connect("R511-2")
 	)
-	Net("unnamed_net39" "(unknown)")
+	Net("unnamed_net43" "(unknown)")
 	(
 		Connect("C502-2")
 		Connect("R502-2")
 	)
-	Net("unnamed_net40" "(unknown)")
+	Net("unnamed_net44" "(unknown)")
 	(
 		Connect("C504-2")
 		Connect("R504-2")
 		Connect("R506-2")
 	)
-	Net("unnamed_net41" "(unknown)")
+	Net("unnamed_net45" "(unknown)")
 	(
 		Connect("IC502-3")
 		Connect("R511-1")
 	)
-	Net("unnamed_net42" "(unknown)")
+	Net("unnamed_net46" "(unknown)")
 	(
 		Connect("C505-1")
 		Connect("IC502-1")
@@ -2896,25 +2938,25 @@ NetList()
 		Connect("R513-1")
 		Connect("Z502-1")
 	)
-	Net("unnamed_net43" "(unknown)")
+	Net("unnamed_net47" "(unknown)")
 	(
 		Connect("IC502-6")
 		Connect("R512-2")
 		Connect("R513-2")
 	)
-	Net("unnamed_net44" "(unknown)")
+	Net("unnamed_net48" "(unknown)")
 	(
 		Connect("C506-1")
 		Connect("IC502-7")
 		Connect("R512-1")
 		Connect("Z501-1")
 	)
-	Net("unnamed_net45" "(unknown)")
+	Net("unnamed_net49" "(unknown)")
 	(
 		Connect("C505-2")
 		Connect("R509-2")
 	)
-	Net("unnamed_net46" "(unknown)")
+	Net("unnamed_net50" "(unknown)")
 	(
 		Connect("C506-2")
 		Connect("R510-2")
@@ -2929,7 +2971,6 @@ NetList()
 		Connect("IC402-8")
 		Connect("IC501-8")
 		Connect("IC502-8")
-		Connect("Q301-1")
 		Connect("Q302-1")
 		Connect("R101-2")
 		Connect("R104-1")
diff --git a/gschem/preamp_bass.sch b/gschem/preamp_bass.sch
deleted file mode 100644
index d2a53b0..0000000
--- a/gschem/preamp_bass.sch
+++ /dev/null
@@ -1,265 +0,0 @@
-v 20110115 2
-C 40000 40000 0 0 0 title-B.sym
-C 46100 47700 1 0 1 capacitor-4.sym
-{
-T 45900 48800 5 10 0 0 0 6 1
-device=POLARIZED_CAPACITOR
-T 45800 48200 5 10 1 1 0 6 1
-refdes=C101
-T 45900 48400 5 10 0 0 0 6 1
-symversion=0.1
-T 45500 47400 5 10 1 1 0 0 1
-value=10u
-T 46100 47700 5 10 0 1 0 0 1
-footprint=RCY100P
-}
-C 48200 46500 1 90 0 capacitor-4.sym
-{
-T 47100 46700 5 10 0 0 90 0 1
-device=POLARIZED_CAPACITOR
-T 47700 47200 5 10 1 1 180 0 1
-refdes=C102
-T 47500 46700 5 10 0 0 90 0 1
-symversion=0.1
-T 47300 46800 5 10 1 1 0 0 1
-value=3.3u
-T 48200 46500 5 10 0 1 0 0 1
-footprint=RCY100P
-}
-C 46500 48200 1 90 0 resistor-2.sym
-{
-T 46150 48600 5 10 0 0 90 0 1
-device=RESISTOR
-T 46200 48900 5 10 1 1 180 0 1
-refdes=R101
-T 45900 48600 5 10 1 1 0 0 1
-value=10k
-T 46500 48200 5 10 0 1 0 0 1
-footprint=R025
-}
-C 46500 46700 1 90 0 resistor-2.sym
-{
-T 46150 47100 5 10 0 0 90 0 1
-device=RESISTOR
-T 46200 47300 5 10 1 1 180 0 1
-refdes=R102
-T 45900 47000 5 10 1 1 0 0 1
-value=10k
-T 46500 46700 5 10 0 1 0 0 1
-footprint=R025
-}
-C 47600 48000 1 180 0 resistor-2.sym
-{
-T 47200 47650 5 10 0 0 180 0 1
-device=RESISTOR
-T 47300 48200 5 10 1 1 180 0 1
-refdes=R103
-T 47000 47600 5 10 1 1 0 0 1
-value=5.1M
-T 47600 48000 5 10 0 1 0 0 1
-footprint=R025
-}
-N 46100 47900 46700 47900 4
-N 45200 47900 44800 47900 4
-N 44800 47900 44800 46500 4
-N 46400 46700 46400 46500 4
-N 46400 49100 46400 49800 4
-C 45500 44700 1 0 0 capacitor-1.sym
-{
-T 45700 45400 5 10 0 0 0 0 1
-device=CAPACITOR
-T 45800 45200 5 10 1 1 0 0 1
-refdes=C103
-T 45700 45600 5 10 0 0 0 0 1
-symversion=0.1
-T 45700 44500 5 10 1 1 0 0 1
-value=0.47u
-T 45500 44700 5 10 0 0 0 0 1
-footprint=CK06_type_capacitor
-}
-C 48000 43500 1 90 0 capacitor-1.sym
-{
-T 47300 43700 5 10 0 0 90 0 1
-device=CAPACITOR
-T 48300 44200 5 10 1 1 180 0 1
-refdes=C104
-T 47100 43700 5 10 0 0 90 0 1
-symversion=0.1
-T 48100 43800 5 10 1 1 0 0 1
-value=10p
-T 48000 43500 5 10 0 0 0 0 1
-footprint=ACY100
-}
-C 48300 47700 1 0 0 JFET_N-Channel-1.sym
-{
-T 48650 48500 5 10 1 1 0 6 1
-model=J201
-T 48300 49750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 48300 47700 5 10 1 1 0 0 1
-refdes=Q101
-T 48300 47700 5 10 0 1 0 0 1
-footprint=TO92
-}
-N 47600 47900 48300 47900 4
-N 48000 47400 48000 47900 4
-C 48300 44700 1 0 0 JFET_N-Channel-1.sym
-{
-T 48650 45500 5 10 1 1 0 6 1
-model=J201
-T 48300 46750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 48300 44700 5 10 1 1 0 0 1
-refdes=Q102
-T 48300 44700 5 10 0 1 0 0 1
-footprint=TO92
-}
-C 50000 45700 1 0 0 JFET_N-Channel-1.sym
-{
-T 50850 46000 5 10 1 1 0 6 1
-model=J201
-T 50000 47750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 50000 45700 5 10 1 1 0 0 1
-refdes=Q103
-T 50000 45700 5 10 0 1 0 0 1
-footprint=TO92
-}
-N 48700 47700 48700 45900 4
-N 48000 45900 50000 45900 4
-N 48000 45900 48000 46500 4
-N 49500 45900 49500 46300 4
-N 48700 45900 48700 45500 4
-C 49400 49800 1 270 0 resistor-2.sym
-{
-T 49750 49400 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 49400 5 10 1 1 0 0 1
-refdes=R104
-T 49700 49200 5 10 1 1 0 0 1
-value=100
-T 49400 49800 5 10 0 1 0 0 1
-footprint=R025
-}
-C 50900 48800 1 180 1 capacitor-4.sym
-{
-T 51100 47700 5 10 0 0 180 6 1
-device=POLARIZED_CAPACITOR
-T 51200 49000 5 10 1 1 180 6 1
-refdes=C105
-T 51100 48100 5 10 0 0 180 6 1
-symversion=0.1
-T 51100 48200 5 10 1 1 0 0 1
-value=100u
-T 50900 48800 5 10 0 2 0 0 1
-footprint=RCY150P
-}
-N 48700 48500 48700 48600 4
-N 48700 48600 50900 48600 4
-N 49500 48900 49500 48600 4
-N 50400 46500 50400 48600 4
-C 50300 44500 1 270 0 resistor-2.sym
-{
-T 50650 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 50600 44000 5 10 1 1 0 0 1
-refdes=R105
-T 50600 43800 5 10 1 1 0 0 1
-value=10k
-T 50300 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-C 48600 44500 1 270 0 resistor-2.sym
-{
-T 48950 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 48900 44000 5 10 1 1 0 0 1
-refdes=R106
-T 48900 43800 5 10 1 1 0 0 1
-value=6k8
-T 48600 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-C 49400 44500 1 270 0 resistor-2.sym
-{
-T 49750 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 44000 5 10 1 1 0 0 1
-refdes=R107
-T 49700 43800 5 10 1 1 0 0 1
-value=220k
-T 49400 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-N 49500 45900 49500 44500 4
-N 50400 45700 50400 44500 4
-N 48700 44700 48700 44500 4
-N 46400 44900 48300 44900 4
-N 47800 44900 47800 44400 4
-C 46800 44500 1 270 0 resistor-2.sym
-{
-T 47150 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 46500 44000 5 10 1 1 0 0 1
-refdes=R108
-T 46400 43800 5 10 1 1 0 0 1
-value=10M
-T 46800 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-N 46900 44500 46900 44900 4
-C 43600 44800 1 0 0 input-2.sym
-{
-T 43700 44500 5 10 1 0 0 0 1
-net=INPUT_2:1
-T 44200 45500 5 10 0 0 0 0 1
-device=none
-T 44100 44900 5 10 1 1 0 7 1
-value=BASS
-}
-N 45000 44900 45500 44900 4
-C 46200 49800 1 0 0 vcc-2.sym
-C 49300 49800 1 0 0 vcc-2.sym
-C 49300 47400 1 0 0 vcc-2.sym
-C 44500 45900 1 0 0 vcc-minus-1.sym
-C 46100 45900 1 0 0 vcc-minus-1.sym
-C 46600 42900 1 0 0 vcc-minus-1.sym
-C 47500 42900 1 0 0 vcc-minus-1.sym
-C 48400 42900 1 0 0 vcc-minus-1.sym
-C 49200 42900 1 0 0 vcc-minus-1.sym
-C 50100 42900 1 0 0 vcc-minus-1.sym
-C 51700 47400 1 0 0 vcc-minus-1.sym
-N 51800 48600 52000 48600 4
-N 52000 48600 52000 48000 4
-N 46400 47900 46400 48200 4
-N 46400 47600 46400 47900 4
-N 46900 43500 46900 43600 4
-N 48700 43500 48700 43600 4
-N 49500 43500 49500 43600 4
-N 50400 43500 50400 43600 4
-C 52900 45000 1 180 0 input-2.sym
-{
-T 53000 44700 5 10 1 0 180 0 1
-net=PREAMP_2:1
-T 52300 44300 5 10 0 0 180 0 1
-device=none
-T 52400 44900 5 10 1 1 180 7 1
-value=BASS OUTPUT
-}
-N 51500 44900 50400 44900 4
-N 49500 47200 49500 47400 4
-C 49400 47200 1 270 0 resistor-2.sym
-{
-T 49750 46800 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 46700 5 10 1 1 0 0 1
-refdes=R109
-T 49700 46500 5 10 1 1 0 0 1
-value=220k
-T 49400 47200 5 10 0 1 0 0 1
-footprint=R025
-}
-T 50200 40900 9 16 1 0 0 0 1
-Preamp (Bass)
-T 52200 44000 9 10 1 0 0 0 1
-TODO: need coupling capacitor?
diff --git a/gschem/preamp_melody.sch b/gschem/preamp_melody.sch
deleted file mode 100644
index 183f0d4..0000000
--- a/gschem/preamp_melody.sch
+++ /dev/null
@@ -1,265 +0,0 @@
-v 20110115 2
-C 40000 40000 0 0 0 title-B.sym
-C 46100 47700 1 0 1 capacitor-4.sym
-{
-T 45900 48800 5 10 0 0 0 6 1
-device=POLARIZED_CAPACITOR
-T 45800 48200 5 10 1 1 0 6 1
-refdes=C201
-T 45900 48400 5 10 0 0 0 6 1
-symversion=0.1
-T 45500 47400 5 10 1 1 0 0 1
-value=10u
-T 46100 47700 5 10 0 1 0 0 1
-footprint=RCY100P
-}
-C 48200 46500 1 90 0 capacitor-4.sym
-{
-T 47100 46700 5 10 0 0 90 0 1
-device=POLARIZED_CAPACITOR
-T 47700 47200 5 10 1 1 180 0 1
-refdes=C202
-T 47500 46700 5 10 0 0 90 0 1
-symversion=0.1
-T 47300 46800 5 10 1 1 0 0 1
-value=3.3u
-T 48200 46500 5 10 0 1 0 0 1
-footprint=RCY100P
-}
-C 46500 48200 1 90 0 resistor-2.sym
-{
-T 46150 48600 5 10 0 0 90 0 1
-device=RESISTOR
-T 46200 48900 5 10 1 1 180 0 1
-refdes=R201
-T 45900 48600 5 10 1 1 0 0 1
-value=10k
-T 46500 48200 5 10 0 1 0 0 1
-footprint=R025
-}
-C 46500 46700 1 90 0 resistor-2.sym
-{
-T 46150 47100 5 10 0 0 90 0 1
-device=RESISTOR
-T 46200 47300 5 10 1 1 180 0 1
-refdes=R202
-T 45900 47000 5 10 1 1 0 0 1
-value=10k
-T 46500 46700 5 10 0 1 0 0 1
-footprint=R025
-}
-C 47600 48000 1 180 0 resistor-2.sym
-{
-T 47200 47650 5 10 0 0 180 0 1
-device=RESISTOR
-T 47300 48200 5 10 1 1 180 0 1
-refdes=R203
-T 47000 47600 5 10 1 1 0 0 1
-value=5.1M
-T 47600 48000 5 10 0 1 0 0 1
-footprint=R025
-}
-N 46100 47900 46700 47900 4
-N 45200 47900 44800 47900 4
-N 44800 47900 44800 46500 4
-N 46400 46700 46400 46500 4
-N 46400 49100 46400 49800 4
-C 45500 44700 1 0 0 capacitor-1.sym
-{
-T 45700 45400 5 10 0 0 0 0 1
-device=CAPACITOR
-T 45800 45200 5 10 1 1 0 0 1
-refdes=C203
-T 45700 45600 5 10 0 0 0 0 1
-symversion=0.1
-T 45700 44500 5 10 1 1 0 0 1
-value=0.47u
-T 45500 44700 5 10 0 1 0 0 1
-footprint=CK06_type_capacitor
-}
-C 48000 43500 1 90 0 capacitor-1.sym
-{
-T 47300 43700 5 10 0 0 90 0 1
-device=CAPACITOR
-T 48300 44200 5 10 1 1 180 0 1
-refdes=C204
-T 47100 43700 5 10 0 0 90 0 1
-symversion=0.1
-T 48100 43800 5 10 1 1 0 0 1
-value=10p
-T 48000 43500 5 10 0 1 0 0 1
-footprint=ACY100
-}
-C 48300 47700 1 0 0 JFET_N-Channel-1.sym
-{
-T 48650 48500 5 10 1 1 0 6 1
-model=J201
-T 48300 49750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 48300 47700 5 10 1 1 0 0 1
-refdes=Q201
-T 48300 47700 5 10 0 1 0 0 1
-footprint=TO92
-}
-N 47600 47900 48300 47900 4
-N 48000 47400 48000 47900 4
-C 48300 44700 1 0 0 JFET_N-Channel-1.sym
-{
-T 48650 45500 5 10 1 1 0 6 1
-model=J201
-T 48300 46750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 48300 44700 5 10 1 1 0 0 1
-refdes=Q202
-T 48300 44700 5 10 0 1 0 0 1
-footprint=TO92
-}
-C 50000 45700 1 0 0 JFET_N-Channel-1.sym
-{
-T 50850 46000 5 10 1 1 0 6 1
-model=J201
-T 50000 47750 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 50000 45700 5 10 1 1 0 0 1
-refdes=Q203
-T 50000 45700 5 10 0 1 0 0 1
-footprint=TO92
-}
-N 48700 47700 48700 45900 4
-N 48000 45900 50000 45900 4
-N 48000 45900 48000 46500 4
-N 49500 45900 49500 46300 4
-N 48700 45900 48700 45500 4
-C 49400 49800 1 270 0 resistor-2.sym
-{
-T 49750 49400 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 49400 5 10 1 1 0 0 1
-refdes=R204
-T 49700 49200 5 10 1 1 0 0 1
-value=100
-T 49400 49800 5 10 0 1 0 0 1
-footprint=R025
-}
-C 50900 48800 1 180 1 capacitor-4.sym
-{
-T 51100 47700 5 10 0 0 180 6 1
-device=POLARIZED_CAPACITOR
-T 51200 49000 5 10 1 1 180 6 1
-refdes=C205
-T 51100 48100 5 10 0 0 180 6 1
-symversion=0.1
-T 51100 48200 5 10 1 1 0 0 1
-value=100u
-T 50900 48800 5 10 0 1 0 0 1
-footprint=RCY150P
-}
-N 48700 48500 48700 48600 4
-N 48700 48600 50900 48600 4
-N 49500 48900 49500 48600 4
-N 50400 46500 50400 48600 4
-C 50300 44500 1 270 0 resistor-2.sym
-{
-T 50650 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 50600 44000 5 10 1 1 0 0 1
-refdes=R205
-T 50600 43800 5 10 1 1 0 0 1
-value=10k
-T 50300 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-C 48600 44500 1 270 0 resistor-2.sym
-{
-T 48950 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 48900 44000 5 10 1 1 0 0 1
-refdes=R206
-T 48900 43800 5 10 1 1 0 0 1
-value=6k8
-T 48600 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-C 49400 44500 1 270 0 resistor-2.sym
-{
-T 49750 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 44000 5 10 1 1 0 0 1
-refdes=R207
-T 49700 43800 5 10 1 1 0 0 1
-value=220k
-T 49400 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-N 49500 45900 49500 44500 4
-N 50400 45700 50400 44500 4
-N 48700 44700 48700 44500 4
-N 46400 44900 48300 44900 4
-N 47800 44900 47800 44400 4
-C 46800 44500 1 270 0 resistor-2.sym
-{
-T 47150 44100 5 10 0 0 270 0 1
-device=RESISTOR
-T 46500 44000 5 10 1 1 0 0 1
-refdes=R208
-T 46400 43800 5 10 1 1 0 0 1
-value=10M
-T 46800 44500 5 10 0 1 0 0 1
-footprint=R025
-}
-N 46900 44500 46900 44900 4
-C 43600 44800 1 0 0 input-2.sym
-{
-T 43500 44500 5 10 1 0 0 0 1
-net=INPUT_1:1
-T 44200 45500 5 10 0 0 0 0 1
-device=none
-T 44100 44900 5 10 1 1 0 7 1
-value=MELODY
-}
-N 45000 44900 45500 44900 4
-C 46200 49800 1 0 0 vcc-2.sym
-C 49300 49800 1 0 0 vcc-2.sym
-C 49300 47400 1 0 0 vcc-2.sym
-C 44500 45900 1 0 0 vcc-minus-1.sym
-C 46100 45900 1 0 0 vcc-minus-1.sym
-C 46600 42900 1 0 0 vcc-minus-1.sym
-C 47500 42900 1 0 0 vcc-minus-1.sym
-C 48400 42900 1 0 0 vcc-minus-1.sym
-C 49200 42900 1 0 0 vcc-minus-1.sym
-C 50100 42900 1 0 0 vcc-minus-1.sym
-C 51700 47400 1 0 0 vcc-minus-1.sym
-N 51800 48600 52000 48600 4
-N 52000 48600 52000 48000 4
-N 46400 47900 46400 48200 4
-N 46400 47600 46400 47900 4
-N 46900 43500 46900 43600 4
-N 48700 43500 48700 43600 4
-N 49500 43500 49500 43600 4
-N 50400 43500 50400 43600 4
-C 52900 45000 1 180 0 input-2.sym
-{
-T 53000 44700 5 10 1 0 180 0 1
-net=PREAMP_1:1
-T 52300 44300 5 10 0 0 180 0 1
-device=none
-T 52400 44900 5 10 1 1 180 7 1
-value=MELODY OUTPUT
-}
-N 51500 44900 50400 44900 4
-N 49500 47200 49500 47400 4
-C 49400 47200 1 270 0 resistor-2.sym
-{
-T 49750 46800 5 10 0 0 270 0 1
-device=RESISTOR
-T 49700 46700 5 10 1 1 0 0 1
-refdes=R209
-T 49700 46500 5 10 1 1 0 0 1
-value=220k
-T 49400 47200 5 10 0 1 0 0 1
-footprint=R025
-}
-T 50200 40900 9 16 1 0 0 0 1
-Preamp (Melody)
-T 52200 44000 9 10 1 0 0 0 1
-TODO: need coupling capacitor?
diff --git a/gschem/preamps.sch b/gschem/preamps.sch
new file mode 100644
index 0000000..b7ce376
--- /dev/null
+++ b/gschem/preamps.sch
@@ -0,0 +1,578 @@
+v 20110115 2
+C 42200 51000 1 0 1 capacitor-4.sym
+{
+T 42000 52100 5 10 0 0 0 6 1
+device=POLARIZED_CAPACITOR
+T 41900 51500 5 10 1 1 0 6 1
+refdes=C101
+T 42000 51700 5 10 0 0 0 6 1
+symversion=0.1
+T 41600 50700 5 10 1 1 0 0 1
+value=10u
+T 42200 51000 5 10 0 1 0 0 1
+footprint=RCY100P
+}
+C 44300 49800 1 90 0 capacitor-4.sym
+{
+T 43200 50000 5 10 0 0 90 0 1
+device=POLARIZED_CAPACITOR
+T 43800 50500 5 10 1 1 180 0 1
+refdes=C102
+T 43600 50000 5 10 0 0 90 0 1
+symversion=0.1
+T 43400 50100 5 10 1 1 0 0 1
+value=3.3u
+T 44300 49800 5 10 0 1 0 0 1
+footprint=RCY100P
+}
+C 42600 51500 1 90 0 resistor-2.sym
+{
+T 42250 51900 5 10 0 0 90 0 1
+device=RESISTOR
+T 42300 52200 5 10 1 1 180 0 1
+refdes=R101
+T 42000 51900 5 10 1 1 0 0 1
+value=10k
+T 42600 51500 5 10 0 1 0 0 1
+footprint=R025
+}
+C 42600 50000 1 90 0 resistor-2.sym
+{
+T 42250 50400 5 10 0 0 90 0 1
+device=RESISTOR
+T 42300 50600 5 10 1 1 180 0 1
+refdes=R102
+T 42000 50300 5 10 1 1 0 0 1
+value=10k
+T 42600 50000 5 10 0 1 0 0 1
+footprint=R025
+}
+C 43700 51300 1 180 0 resistor-2.sym
+{
+T 43300 50950 5 10 0 0 180 0 1
+device=RESISTOR
+T 43400 51500 5 10 1 1 180 0 1
+refdes=R103
+T 43100 50900 5 10 1 1 0 0 1
+value=5.1M
+T 43700 51300 5 10 0 1 0 0 1
+footprint=R025
+}
+N 42200 51200 42800 51200 4
+N 41300 51200 40900 51200 4
+N 40900 51200 40900 49800 4
+N 42500 50000 42500 49800 4
+N 42500 52400 42500 53100 4
+C 41600 48000 1 0 0 capacitor-1.sym
+{
+T 41800 48700 5 10 0 0 0 0 1
+device=CAPACITOR
+T 41900 48500 5 10 1 1 0 0 1
+refdes=C103
+T 41800 48900 5 10 0 0 0 0 1
+symversion=0.1
+T 41800 47800 5 10 1 1 0 0 1
+value=0.47u
+T 41600 48000 5 10 0 0 0 0 1
+footprint=CK06_type_capacitor
+}
+C 44100 46800 1 90 0 capacitor-1.sym
+{
+T 43400 47000 5 10 0 0 90 0 1
+device=CAPACITOR
+T 44400 47500 5 10 1 1 180 0 1
+refdes=C104
+T 43200 47000 5 10 0 0 90 0 1
+symversion=0.1
+T 44200 47100 5 10 1 1 0 0 1
+value=10p
+T 44100 46800 5 10 0 0 0 0 1
+footprint=ACY100
+}
+C 44400 51000 1 0 0 JFET_N-Channel-1.sym
+{
+T 44750 51800 5 10 1 1 0 6 1
+model=J201
+T 44400 53050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 44400 51000 5 10 1 1 0 0 1
+refdes=Q101
+T 44400 51000 5 10 0 1 0 0 1
+footprint=TO92
+}
+N 43700 51200 44400 51200 4
+N 44100 50700 44100 51200 4
+C 44400 48000 1 0 0 JFET_N-Channel-1.sym
+{
+T 44750 48800 5 10 1 1 0 6 1
+model=J201
+T 44400 50050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 44400 48000 5 10 1 1 0 0 1
+refdes=Q102
+T 44400 48000 5 10 0 1 0 0 1
+footprint=TO92
+}
+C 46100 49000 1 0 0 JFET_N-Channel-1.sym
+{
+T 46950 49300 5 10 1 1 0 6 1
+model=J201
+T 46100 51050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 46100 49000 5 10 1 1 0 0 1
+refdes=Q103
+T 46100 49000 5 10 0 1 0 0 1
+footprint=TO92
+}
+N 44800 51000 44800 49200 4
+N 44100 49200 46100 49200 4
+N 44100 49200 44100 49800 4
+N 45600 49200 45600 49600 4
+N 44800 49200 44800 48800 4
+C 45500 53100 1 270 0 resistor-2.sym
+{
+T 45850 52700 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 52700 5 10 1 1 0 0 1
+refdes=R104
+T 45800 52500 5 10 1 1 0 0 1
+value=100
+T 45500 53100 5 10 0 1 0 0 1
+footprint=R025
+}
+C 47000 52100 1 180 1 capacitor-4.sym
+{
+T 47200 51000 5 10 0 0 180 6 1
+device=POLARIZED_CAPACITOR
+T 47300 52300 5 10 1 1 180 6 1
+refdes=C105
+T 47200 51400 5 10 0 0 180 6 1
+symversion=0.1
+T 47200 51500 5 10 1 1 0 0 1
+value=100u
+T 47000 52100 5 10 0 2 0 0 1
+footprint=RCY150P
+}
+N 44800 51800 44800 51900 4
+N 44800 51900 47000 51900 4
+N 45600 52200 45600 51900 4
+N 46500 49800 46500 51900 4
+C 46400 47800 1 270 0 resistor-2.sym
+{
+T 46750 47400 5 10 0 0 270 0 1
+device=RESISTOR
+T 46700 47300 5 10 1 1 0 0 1
+refdes=R105
+T 46700 47100 5 10 1 1 0 0 1
+value=10k
+T 46400 47800 5 10 0 1 0 0 1
+footprint=R025
+}
+C 44700 47800 1 270 0 resistor-2.sym
+{
+T 45050 47400 5 10 0 0 270 0 1
+device=RESISTOR
+T 45000 47300 5 10 1 1 0 0 1
+refdes=R106
+T 45000 47100 5 10 1 1 0 0 1
+value=6k8
+T 44700 47800 5 10 0 1 0 0 1
+footprint=R025
+}
+C 45500 47800 1 270 0 resistor-2.sym
+{
+T 45850 47400 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 47300 5 10 1 1 0 0 1
+refdes=R107
+T 45800 47100 5 10 1 1 0 0 1
+value=220k
+T 45500 47800 5 10 0 1 0 0 1
+footprint=R025
+}
+N 45600 49200 45600 47800 4
+N 46500 49000 46500 47800 4
+N 44800 48000 44800 47800 4
+N 42500 48200 44400 48200 4
+N 43900 48200 43900 47700 4
+C 42900 47800 1 270 0 resistor-2.sym
+{
+T 43250 47400 5 10 0 0 270 0 1
+device=RESISTOR
+T 42600 47300 5 10 1 1 0 0 1
+refdes=R108
+T 42500 47100 5 10 1 1 0 0 1
+value=10M
+T 42900 47800 5 10 0 1 0 0 1
+footprint=R025
+}
+N 43000 47800 43000 48200 4
+C 39700 48100 1 0 0 input-2.sym
+{
+T 39800 47800 5 10 1 0 0 0 1
+net=INPUT_2:1
+T 40300 48800 5 10 0 0 0 0 1
+device=none
+T 40200 48200 5 10 1 1 0 7 1
+value=BASS
+}
+N 41100 48200 41600 48200 4
+C 42300 53100 1 0 0 vcc-2.sym
+C 45400 53100 1 0 0 vcc-2.sym
+C 45400 50700 1 0 0 vcc-2.sym
+C 40600 49200 1 0 0 vcc-minus-1.sym
+C 42200 49200 1 0 0 vcc-minus-1.sym
+C 42700 46200 1 0 0 vcc-minus-1.sym
+C 43600 46200 1 0 0 vcc-minus-1.sym
+C 44500 46200 1 0 0 vcc-minus-1.sym
+C 45300 46200 1 0 0 vcc-minus-1.sym
+C 46200 46200 1 0 0 vcc-minus-1.sym
+C 47800 50700 1 0 0 vcc-minus-1.sym
+N 47900 51900 48100 51900 4
+N 48100 51900 48100 51300 4
+N 42500 51200 42500 51500 4
+N 42500 50900 42500 51200 4
+N 43000 46800 43000 46900 4
+N 44800 46800 44800 46900 4
+N 45600 46800 45600 46900 4
+N 46500 46800 46500 46900 4
+C 49000 48300 1 180 0 input-2.sym
+{
+T 49100 48000 5 10 1 0 180 0 1
+net=PREAMP_2:1
+T 48400 47600 5 10 0 0 180 0 1
+device=none
+T 48500 48200 5 10 1 1 180 7 1
+value=BASS OUTPUT
+}
+N 47600 48200 46500 48200 4
+N 45600 50500 45600 50700 4
+C 45500 50500 1 270 0 resistor-2.sym
+{
+T 45850 50100 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 50000 5 10 1 1 0 0 1
+refdes=R109
+T 45800 49800 5 10 1 1 0 0 1
+value=220k
+T 45500 50500 5 10 0 1 0 0 1
+footprint=R025
+}
+T 48300 38500 9 16 1 0 0 0 1
+Preamps
+T 48300 47300 9 10 1 0 0 0 1
+TODO: need coupling capacitor?
+C 42200 43000 1 0 1 capacitor-4.sym
+{
+T 42000 44100 5 10 0 0 0 6 1
+device=POLARIZED_CAPACITOR
+T 41900 43500 5 10 1 1 0 6 1
+refdes=C201
+T 42000 43700 5 10 0 0 0 6 1
+symversion=0.1
+T 41600 42700 5 10 1 1 0 0 1
+value=10u
+T 42200 43000 5 10 0 1 0 0 1
+footprint=RCY100P
+}
+C 44300 41800 1 90 0 capacitor-4.sym
+{
+T 43200 42000 5 10 0 0 90 0 1
+device=POLARIZED_CAPACITOR
+T 43800 42500 5 10 1 1 180 0 1
+refdes=C202
+T 43600 42000 5 10 0 0 90 0 1
+symversion=0.1
+T 43400 42100 5 10 1 1 0 0 1
+value=3.3u
+T 44300 41800 5 10 0 1 0 0 1
+footprint=RCY100P
+}
+C 42600 43500 1 90 0 resistor-2.sym
+{
+T 42250 43900 5 10 0 0 90 0 1
+device=RESISTOR
+T 42300 44200 5 10 1 1 180 0 1
+refdes=R201
+T 42000 43900 5 10 1 1 0 0 1
+value=10k
+T 42600 43500 5 10 0 1 0 0 1
+footprint=R025
+}
+C 42600 42000 1 90 0 resistor-2.sym
+{
+T 42250 42400 5 10 0 0 90 0 1
+device=RESISTOR
+T 42300 42600 5 10 1 1 180 0 1
+refdes=R202
+T 42000 42300 5 10 1 1 0 0 1
+value=10k
+T 42600 42000 5 10 0 1 0 0 1
+footprint=R025
+}
+C 43700 43300 1 180 0 resistor-2.sym
+{
+T 43300 42950 5 10 0 0 180 0 1
+device=RESISTOR
+T 43400 43500 5 10 1 1 180 0 1
+refdes=R203
+T 43100 42900 5 10 1 1 0 0 1
+value=5.1M
+T 43700 43300 5 10 0 1 0 0 1
+footprint=R025
+}
+N 42200 43200 42800 43200 4
+N 41300 43200 40900 43200 4
+N 40900 43200 40900 41800 4
+N 42500 42000 42500 41800 4
+N 42500 44400 42500 45100 4
+C 41600 40000 1 0 0 capacitor-1.sym
+{
+T 41800 40700 5 10 0 0 0 0 1
+device=CAPACITOR
+T 41900 40500 5 10 1 1 0 0 1
+refdes=C203
+T 41800 40900 5 10 0 0 0 0 1
+symversion=0.1
+T 41800 39800 5 10 1 1 0 0 1
+value=0.47u
+T 41600 40000 5 10 0 1 0 0 1
+footprint=CK06_type_capacitor
+}
+C 44100 38800 1 90 0 capacitor-1.sym
+{
+T 43400 39000 5 10 0 0 90 0 1
+device=CAPACITOR
+T 44400 39500 5 10 1 1 180 0 1
+refdes=C204
+T 43200 39000 5 10 0 0 90 0 1
+symversion=0.1
+T 44200 39100 5 10 1 1 0 0 1
+value=10p
+T 44100 38800 5 10 0 1 0 0 1
+footprint=ACY100
+}
+C 44400 43000 1 0 0 JFET_N-Channel-1.sym
+{
+T 44750 43800 5 10 1 1 0 6 1
+model=J201
+T 44400 45050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 44400 43000 5 10 1 1 0 0 1
+refdes=Q201
+T 44400 43000 5 10 0 1 0 0 1
+footprint=TO92
+}
+N 43700 43200 44400 43200 4
+N 44100 42700 44100 43200 4
+C 44400 40000 1 0 0 JFET_N-Channel-1.sym
+{
+T 44750 40800 5 10 1 1 0 6 1
+model=J201
+T 44400 42050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 44400 40000 5 10 1 1 0 0 1
+refdes=Q202
+T 44400 40000 5 10 0 1 0 0 1
+footprint=TO92
+}
+C 46100 41000 1 0 0 JFET_N-Channel-1.sym
+{
+T 46950 41300 5 10 1 1 0 6 1
+model=J201
+T 46100 43050 5 10 0 0 0 0 1
+device=JFET N-Channel
+T 46100 41000 5 10 1 1 0 0 1
+refdes=Q203
+T 46100 41000 5 10 0 1 0 0 1
+footprint=TO92
+}
+N 44800 43000 44800 41200 4
+N 44100 41200 46100 41200 4
+N 44100 41200 44100 41800 4
+N 45600 41200 45600 41600 4
+N 44800 41200 44800 40800 4
+C 45500 45100 1 270 0 resistor-2.sym
+{
+T 45850 44700 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 44700 5 10 1 1 0 0 1
+refdes=R204
+T 45800 44500 5 10 1 1 0 0 1
+value=100
+T 45500 45100 5 10 0 1 0 0 1
+footprint=R025
+}
+C 47000 44100 1 180 1 capacitor-4.sym
+{
+T 47200 43000 5 10 0 0 180 6 1
+device=POLARIZED_CAPACITOR
+T 47300 44300 5 10 1 1 180 6 1
+refdes=C205
+T 47200 43400 5 10 0 0 180 6 1
+symversion=0.1
+T 47200 43500 5 10 1 1 0 0 1
+value=100u
+T 47000 44100 5 10 0 1 0 0 1
+footprint=RCY150P
+}
+N 44800 43800 44800 43900 4
+N 44800 43900 47000 43900 4
+N 45600 44200 45600 43900 4
+N 46500 41800 46500 43900 4
+C 46400 39800 1 270 0 resistor-2.sym
+{
+T 46750 39400 5 10 0 0 270 0 1
+device=RESISTOR
+T 46700 39300 5 10 1 1 0 0 1
+refdes=R205
+T 46700 39100 5 10 1 1 0 0 1
+value=10k
+T 46400 39800 5 10 0 1 0 0 1
+footprint=R025
+}
+C 44700 39800 1 270 0 resistor-2.sym
+{
+T 45050 39400 5 10 0 0 270 0 1
+device=RESISTOR
+T 45000 39300 5 10 1 1 0 0 1
+refdes=R206
+T 45000 39100 5 10 1 1 0 0 1
+value=6k8
+T 44700 39800 5 10 0 1 0 0 1
+footprint=R025
+}
+C 45500 39800 1 270 0 resistor-2.sym
+{
+T 45850 39400 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 39300 5 10 1 1 0 0 1
+refdes=R207
+T 45800 39100 5 10 1 1 0 0 1
+value=220k
+T 45500 39800 5 10 0 1 0 0 1
+footprint=R025
+}
+N 45600 41200 45600 39800 4
+N 46500 41000 46500 39800 4
+N 44800 40000 44800 39800 4
+N 42500 40200 44400 40200 4
+N 43900 40200 43900 39700 4
+C 42900 39800 1 270 0 resistor-2.sym
+{
+T 43250 39400 5 10 0 0 270 0 1
+device=RESISTOR
+T 42600 39300 5 10 1 1 0 0 1
+refdes=R208
+T 42500 39100 5 10 1 1 0 0 1
+value=10M
+T 42900 39800 5 10 0 1 0 0 1
+footprint=R025
+}
+N 43000 39800 43000 40200 4
+C 39700 40100 1 0 0 input-2.sym
+{
+T 39600 39800 5 10 1 0 0 0 1
+net=INPUT_1:1
+T 40300 40800 5 10 0 0 0 0 1
+device=none
+T 40200 40200 5 10 1 1 0 7 1
+value=MELODY
+}
+N 41100 40200 41600 40200 4
+C 42300 45100 1 0 0 vcc-2.sym
+C 45400 45100 1 0 0 vcc-2.sym
+C 45400 42700 1 0 0 vcc-2.sym
+C 40600 41200 1 0 0 vcc-minus-1.sym
+C 42200 41200 1 0 0 vcc-minus-1.sym
+C 42700 38200 1 0 0 vcc-minus-1.sym
+C 43600 38200 1 0 0 vcc-minus-1.sym
+C 44500 38200 1 0 0 vcc-minus-1.sym
+C 45300 38200 1 0 0 vcc-minus-1.sym
+C 46200 38200 1 0 0 vcc-minus-1.sym
+C 47800 42700 1 0 0 vcc-minus-1.sym
+N 47900 43900 48100 43900 4
+N 48100 43900 48100 43300 4
+N 42500 43200 42500 43500 4
+N 42500 42900 42500 43200 4
+N 43000 38800 43000 38900 4
+N 44800 38800 44800 38900 4
+N 45600 38800 45600 38900 4
+N 46500 38800 46500 38900 4
+C 49000 40300 1 180 0 input-2.sym
+{
+T 49100 40000 5 10 1 0 180 0 1
+net=PREAMP_1:1
+T 48400 39600 5 10 0 0 180 0 1
+device=none
+T 48500 40200 5 10 1 1 180 7 1
+value=MELODY OUTPUT
+}
+N 47600 40200 46500 40200 4
+N 45600 42500 45600 42700 4
+C 45500 42500 1 270 0 resistor-2.sym
+{
+T 45850 42100 5 10 0 0 270 0 1
+device=RESISTOR
+T 45800 42000 5 10 1 1 0 0 1
+refdes=R209
+T 45800 41800 5 10 1 1 0 0 1
+value=220k
+T 45500 42500 5 10 0 1 0 0 1
+footprint=R025
+}
+T 48600 40500 9 10 1 0 0 0 1
+TODO: need coupling capacitor?
+C 31800 37600 0 0 0 title-A2.sym
+C 34500 43900 1 0 1 stereo_jack-1.sym
+{
+T 34205 45600 5 10 1 1 0 6 1
+refdes=K101
+T 34205 46200 5 10 0 0 0 6 1
+device=CONNECTOR
+}
+C 35500 44200 1 0 0 switch-spdt-2.sym
+{
+T 35910 45050 5 10 0 0 0 0 1
+device=Dual_Two_Way_Switch
+T 35910 45700 5 10 1 1 0 0 1
+refdes=S101
+T 36200 45900 5 10 0 0 0 0 1
+symversion=1.0
+}
+C 34700 43000 1 0 0 vcc-minus-1.sym
+N 34500 44100 35000 44100 4
+N 35000 44100 35000 43600 4
+N 34500 44400 35000 44400 4
+N 35000 44400 35000 44500 4
+N 35000 44500 35500 44500 4
+N 34500 45300 35500 45300 4
+N 36500 45500 37200 45500 4
+N 37200 45500 37200 44300 4
+N 36500 44300 37500 44300 4
+N 36500 45100 37500 45100 4
+N 37000 44700 37000 45100 4
+N 37000 44700 36500 44700 4
+C 38900 44400 1 180 0 input-2.sym
+{
+T 39000 44700 5 10 1 0 180 0 1
+net=INPUT_1:1
+T 38300 43700 5 10 0 0 180 0 1
+device=none
+T 38400 44300 5 10 1 1 180 7 1
+value=MELODY
+}
+C 38900 45200 1 180 0 input-2.sym
+{
+T 39000 45500 5 10 1 0 180 0 1
+net=INPUT_2:1
+T 38300 44500 5 10 0 0 180 0 1
+device=none
+T 38400 45100 5 10 1 1 180 7 1
+value=BASS
+}
+T 35400 46200 9 10 1 0 0 0 1
+Swap input signals.
+T 32100 46100 9 10 1 0 0 0 2
+TODO: wire lc and rc to disrupt power
+supply if nothing is connected.
diff --git a/gschem/project b/gschem/project
index 68ab2f3..2e0cbe3 100644
--- a/gschem/project
+++ b/gschem/project
@@ -1,4 +1,4 @@
 elements-dir lib/footprints
 
-schematics preamp_bass.sch preamp_melody.sch tuner.sch crossover.sch outputs.sch
+schematics preamps.sch tuner.sch crossover.sch outputs.sch
 output-name board