simplify melody send/return

I no longer want to use two mono sockets for separate send and return
routing. A single stereo jack for effects insert is just as fine and
easier to implement. I also no longer care for an effects blend
potentiometer that determines how much of the unprocessed signal is to
be blended with the return signal. Controlling the effect intensity is
the external device's job.

2 files changed, 242 insertions, 206 deletions

diff --git a/gschem/lib/symbols/stereo_jack-1.sym b/gschem/lib/symbols/stereo_jack-1.sym
new file mode 100644
index 0000000..7158d5b
--- /dev/null
+++ b/gschem/lib/symbols/stereo_jack-1.sym
@@ -0,0 +1,90 @@
+v 20100214 2
+P 0 1400 300 1400 1 0 0
+{
+T 700 1400 5 8 0 1 0 0 1
+pintype=pas
+T 200 1500 9 8 1 1 0 7 1
+pinlabel=l
+T 400 1400 5 8 0 1 0 0 1
+pinnumber=4
+T 300 1400 5 8 0 1 0 0 1
+pinseq=4
+}
+P 0 1100 300 1100 1 0 0
+{
+T 600 1100 5 8 0 1 0 0 1
+pintype=pas
+T 200 1200 9 8 1 1 0 7 1
+pinlabel=lc
+T 400 1100 5 8 0 1 0 0 1
+pinnumber=3
+T 300 1100 5 8 0 1 0 0 1
+pinseq=3
+}
+P 0 200 300 200 1 0 0
+{
+T 600 200 5 8 0 1 0 0 1
+pintype=pas
+T 200 300 9 8 1 1 0 7 1
+pinlabel=gnd
+T 400 200 5 8 0 1 0 0 1
+pinnumber=5
+T 300 200 5 8 0 1 0 0 1
+pinseq=5
+}
+P 0 800 300 800 1 0 0
+{
+T 600 800 5 8 0 1 0 0 1
+pintype=pas
+T 200 900 9 8 1 1 0 7 1
+pinlabel=rc
+T 400 800 5 8 0 1 0 0 1
+pinnumber=2
+T 300 800 5 8 0 1 0 0 1
+pinseq=2
+}
+P 0 500 300 500 1 0 0
+{
+T 700 500 5 8 0 1 0 0 1
+pintype=pas
+T 200 600 9 8 1 1 0 7 1
+pinlabel=r
+T 400 500 5 8 0 1 0 0 1
+pinnumber=1
+T 300 500 5 8 0 1 0 0 1
+pinseq=1
+}
+B 300 0 1600 1600 3 10 0 0 -1 -1 0 -1 -1 -1 -1 -1
+B 1600 500 100 900 3 0 0 0 -1 -1 1 -1 -1 -1 -1 -1
+L 300 200 1600 200 3 10 0 0 -1 -1
+L 300 500 1200 500 3 10 0 0 -1 -1
+L 1200 500 1300 600 3 10 0 0 -1 -1
+L 1300 600 1400 500 3 10 0 0 -1 -1
+L 300 1100 600 1100 3 10 0 0 -1 -1
+L 800 1400 900 1300 3 10 0 0 -1 -1
+L 1000 1400 900 1300 3 10 0 0 -1 -1
+L 300 800 600 800 3 10 0 0 -1 -1
+L 600 800 600 500 3 10 0 0 -1 -1
+L 300 1400 800 1400 3 10 0 0 -1 -1
+L 600 1400 600 1100 3 10 0 0 -1 -1
+L 650 1350 600 1400 3 10 0 0 -1 -1
+L 600 1400 550 1350 3 10 0 0 -1 -1
+L 550 550 600 500 3 10 0 0 -1 -1
+L 600 500 650 550 3 10 0 0 -1 -1
+T 295 1700 8 10 1 1 0 0 1
+refdes=K?
+T 295 2300 5 10 0 0 0 0 1
+device=CONNECTOR
+T 295 2100 5 10 0 0 0 0 1
+description=Stereo female jack
+T 295 1900 8 10 0 0 0 0 1
+footprint=Female_Stereo_Conn_3.5mm
+T 295 2495 5 10 0 0 0 0 1
+numslots=0
+T 300 3100 5 10 0 0 0 0 1
+author=Amand Tihon amand.tihon@alrj.org
+T 300 2900 5 10 0 0 0 0 1
+dist-license=GPL3, http://www.gnu.org/licenses/gpl-3.0.txt
+T 300 2700 5 10 0 0 0 0 1
+use-license=unrestricted
+L 1600 200 1600 500 3 10 0 0 -1 -1
diff --git a/gschem/tuner.sch b/gschem/tuner.sch
index e0bdf35..ab8747b 100644
--- a/gschem/tuner.sch
+++ b/gschem/tuner.sch
@@ -1,317 +1,263 @@
 v 20110115 2
-C 45600 39800 1 270 0 resistor-2.sym
+C 47500 43000 1 270 0 resistor-2.sym
 {
-T 45950 39400 5 10 0 0 270 0 1
+T 47850 42600 5 10 0 0 270 0 1
 device=RESISTOR
-T 45900 39300 5 10 1 1 0 0 1
+T 47800 42500 5 10 1 1 0 0 1
 refdes=R301
-T 45900 39100 5 10 1 1 0 0 1
+T 47800 42300 5 10 1 1 0 0 1
 value=22k
-T 45600 39800 5 10 0 1 0 0 1
+T 47500 43000 5 10 0 1 0 0 1
 footprint=R025
 }
-N 45700 41000 45700 39800 4
-C 39000 41400 1 0 0 input-2.sym
+N 47600 44200 47600 43000 4
+C 40900 44600 1 0 0 input-2.sym
 {
-T 39000 41100 5 10 1 0 0 0 1
+T 40900 44300 5 10 1 0 0 0 1
 net=PREAMP_1:1
-T 39600 42100 5 10 0 0 0 0 1
+T 41500 45300 5 10 0 0 0 0 1
 device=none
-T 39500 41500 5 10 1 1 0 7 1
+T 41400 44700 5 10 1 1 0 7 1
 value=from melody preamp
 }
-N 40400 41500 40900 41500 4
-C 46100 37900 1 0 0 vcc-minus-1.sym
-C 45400 37900 1 0 0 vcc-minus-1.sym
-N 45700 38500 45700 38900 4
-C 50200 40400 1 180 0 input-2.sym
+N 42300 44700 42800 44700 4
+C 48000 41100 1 0 0 vcc-minus-1.sym
+C 47300 41100 1 0 0 vcc-minus-1.sym
+N 47600 41700 47600 42100 4
+C 52100 43600 1 180 0 input-2.sym
 {
-T 50200 40200 5 10 1 0 180 0 1
+T 52100 43400 5 10 1 0 180 0 1
 net=TUNER:1
-T 49600 39700 5 10 0 0 180 0 1
+T 51500 42900 5 10 0 0 180 0 1
 device=none
-T 49700 40300 5 10 1 1 180 7 1
+T 51600 43500 5 10 1 1 180 7 1
 value=TUNER OUT
 }
-C 39000 39800 1 0 0 input-2.sym
+C 40900 43000 1 0 0 input-2.sym
 {
-T 39000 39500 5 10 1 0 0 0 1
+T 40900 42700 5 10 1 0 0 0 1
 net=PREAMP_2:1
-T 39600 40500 5 10 0 0 0 0 1
+T 41500 43700 5 10 0 0 0 0 1
 device=none
-T 39500 39900 5 10 1 1 0 7 1
+T 41400 43100 5 10 1 1 0 7 1
 value=from bass preamp
 }
-N 40400 39900 40900 39900 4
-C 46200 41600 1 180 0 resistor-variable-2.sym
+N 42300 43100 42800 43100 4
+C 48100 44800 1 180 0 resistor-variable-2.sym
 {
-T 45850 42100 5 10 1 1 180 0 1
+T 47750 45300 5 10 1 1 180 0 1
 refdes=R302
-T 45400 40700 5 10 0 1 180 0 1
+T 47300 43900 5 10 0 1 180 0 1
 device=VARIABLE_RESISTOR
-T 45500 41700 5 10 1 1 0 0 1
+T 47400 44900 5 10 1 1 0 0 1
 value=100k?
-T 46200 41600 5 10 0 1 0 0 1
+T 48100 44800 5 10 0 1 0 0 1
 footprint=BOURNS_3296w
 }
-N 46200 41500 46400 41500 4
-N 46400 41500 46400 38500 4
-N 45700 40300 48800 40300 4
-T 45900 38800 9 10 1 0 0 0 1
+N 48100 44700 48300 44700 4
+N 48300 44700 48300 41700 4
+N 47600 43500 50700 43500 4
+T 47800 42000 9 10 1 0 0 0 1
 taper resistor
-T 42200 40500 9 10 1 0 0 0 1
+T 44100 43700 9 10 1 0 0 0 1
 TODO: turn into active mixer
 T 53500 37800 9 16 1 0 0 0 1
-Tuner output and melody Send/Return
-C 42400 41400 1 0 0 resistor-2.sym
+Tuner output and melody effects insert
+C 44300 44600 1 0 0 resistor-2.sym
 {
-T 42800 41750 5 10 0 0 0 0 1
+T 44700 44950 5 10 0 0 0 0 1
 device=RESISTOR
-T 43000 41800 5 10 1 1 180 0 1
+T 44900 45000 5 10 1 1 180 0 1
 refdes=R303
-T 43000 41300 5 10 1 1 180 0 1
+T 44900 44500 5 10 1 1 180 0 1
 value=10k
-T 42400 41400 5 10 0 1 0 0 1
+T 44300 44600 5 10 0 1 0 0 1
 footprint=R025
 }
-N 41800 41500 42400 41500 4
-C 42400 39800 1 0 0 resistor-2.sym
+N 43700 44700 44300 44700 4
+C 44300 43000 1 0 0 resistor-2.sym
 {
-T 42800 40150 5 10 0 0 0 0 1
+T 44700 43350 5 10 0 0 0 0 1
 device=RESISTOR
-T 43000 40200 5 10 1 1 180 0 1
+T 44900 43400 5 10 1 1 180 0 1
 refdes=R304
-T 43000 39700 5 10 1 1 180 0 1
+T 44900 42900 5 10 1 1 180 0 1
 value=10k
-T 42400 39800 5 10 0 1 0 0 1
+T 44300 43000 5 10 0 1 0 0 1
 footprint=R025
 }
-N 42400 39900 41800 39900 4
-N 43700 39900 43700 41500 4
-N 43700 39900 43300 39900 4
-T 42200 40800 9 10 1 0 0 0 1
+N 44300 43100 43700 43100 4
+N 45600 43100 45600 44700 4
+N 45600 43100 45200 43100 4
+T 44100 44000 9 10 1 0 0 0 1
 passive mixer
-C 45500 50200 1 0 0 JFET_N-Channel-1.sym
+C 47400 48200 1 0 0 JFET_N-Channel-1.sym
 {
-T 45850 51000 5 10 1 1 0 6 1
+T 47750 49000 5 10 1 1 0 6 1
 model=J201
-T 45500 52250 5 10 0 0 0 0 1
+T 47400 50250 5 10 0 0 0 0 1
 device=JFET N-Channel
-T 45500 50200 5 10 1 1 0 0 1
-refdes=Q301
-T 45500 50200 5 10 0 1 0 0 1
-footprint=TO92
-}
-C 45500 46100 1 0 0 JFET_N-Channel-1.sym
-{
-T 45850 46900 5 10 1 1 0 6 1
-model=J201
-T 45500 48150 5 10 0 0 0 0 1
-device=JFET N-Channel
-T 45500 46100 5 10 1 1 0 0 1
+T 47400 48200 5 10 1 1 0 0 1
 refdes=Q302
-T 45500 46100 5 10 0 1 0 0 1
+T 47400 48200 5 10 0 1 0 0 1
 footprint=TO92
 }
-C 42700 49100 1 90 0 resistor-2.sym
+C 44700 47100 1 90 0 resistor-2.sym
 {
-T 42350 49500 5 10 0 0 90 0 1
+T 44350 47500 5 10 0 0 90 0 1
 device=RESISTOR
-T 42800 49600 5 10 1 1 0 0 1
+T 44800 47600 5 10 1 1 0 0 1
 refdes=R305
-T 42800 49400 5 10 1 1 0 0 1
+T 44800 47400 5 10 1 1 0 0 1
 value=5M1
-T 42700 49100 5 10 0 1 0 0 1
+T 44700 47100 5 10 0 1 0 0 1
 footprint=R025
 }
-N 42100 41500 42000 50400 4
-C 42300 48500 1 0 0 vcc-minus-1.sym
-N 42600 50000 42600 50800 4
-C 42700 50800 1 90 0 resistor-2.sym
+N 44000 44700 44000 48400 4
+C 44300 46500 1 0 0 vcc-minus-1.sym
+N 44600 48000 44600 48800 4
+C 44700 48800 1 90 0 resistor-2.sym
 {
-T 42350 51200 5 10 0 0 90 0 1
+T 44350 49200 5 10 0 0 90 0 1
 device=RESISTOR
-T 42800 51300 5 10 1 1 0 0 1
+T 44800 49300 5 10 1 1 0 0 1
 refdes=R306
-T 42800 51100 5 10 1 1 0 0 1
+T 44800 49100 5 10 1 1 0 0 1
 value=5M1
-T 42700 50800 5 10 0 1 0 0 1
+T 44700 48800 5 10 0 1 0 0 1
 footprint=R025
 }
-C 42400 52100 1 0 0 vcc-2.sym
-N 42600 52100 42600 51700 4
-C 45700 52100 1 0 0 vcc-2.sym
-N 45900 52100 45900 51000 4
-N 45900 50000 45900 50200 4
-N 45900 50100 46200 50100 4
-C 45700 47400 1 0 0 vcc-2.sym
-N 45900 47400 45900 46900 4
-C 46000 45000 1 90 0 resistor-2.sym
+C 44400 50100 1 0 0 vcc-2.sym
+N 44600 50100 44600 49700 4
+C 47600 49500 1 0 0 vcc-2.sym
+N 47800 49500 47800 49000 4
+C 47900 47100 1 90 0 resistor-2.sym
 {
-T 45650 45400 5 10 0 0 90 0 1
+T 47550 47500 5 10 0 0 90 0 1
 device=RESISTOR
-T 46100 45500 5 10 1 1 0 0 1
+T 48000 47600 5 10 1 1 0 0 1
 refdes=R307
-T 46100 45300 5 10 1 1 0 0 1
+T 48000 47400 5 10 1 1 0 0 1
 value=4k7
-T 46000 45000 5 10 0 1 0 0 1
+T 47900 47100 5 10 0 1 0 0 1
 footprint=R025
 }
-C 45600 44300 1 0 0 vcc-minus-1.sym
-N 45900 46100 45900 45900 4
-N 45500 46300 44700 46300 4
-N 44700 46300 44700 50400 4
-N 45900 45000 45900 44900 4
+C 47500 46400 1 0 0 vcc-minus-1.sym
+N 47800 48200 47800 48000 4
+N 44600 48400 47400 48400 4
+N 47800 47100 47800 47000 4
 C 37200 36900 0 0 0 title-A2.sym
-N 42000 50400 42600 50400 4
-N 42600 50400 45500 50400 4
-C 46000 49100 1 90 0 resistor-2.sym
-{
-T 45650 49500 5 10 0 0 90 0 1
-device=RESISTOR
-T 46100 49600 5 10 1 1 0 0 1
-refdes=R308
-T 46100 49400 5 10 1 1 0 0 1
-value=4k7
-T 46000 49100 5 10 0 1 0 0 1
-footprint=R025
-}
-C 45600 48400 1 0 0 vcc-minus-1.sym
-N 45900 49000 45900 49100 4
-C 46200 45800 1 0 0 capacitor-4.sym
+N 44000 48400 44600 48400 4
+C 48100 47900 1 0 0 capacitor-4.sym
 {
-T 46400 46900 5 10 0 0 0 0 1
+T 48300 49000 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 46400 46300 5 10 1 1 0 0 1
+T 48300 48400 5 10 1 1 0 0 1
 refdes=C301
-T 46400 46500 5 10 0 0 0 0 1
-symversion=0.1
-T 46200 45800 5 10 1 1 0 0 1
-value=1u
-T 46200 45800 5 10 0 1 0 0 1
-footprint=RCY100P
-}
-N 46200 46000 45900 46000 4
-C 46200 49900 1 0 0 capacitor-4.sym
-{
-T 46400 51000 5 10 0 0 0 0 1
-device=POLARIZED_CAPACITOR
-T 46400 50400 5 10 1 1 0 0 1
-refdes=C302
-T 46400 50600 5 10 0 0 0 0 1
+T 48300 48600 5 10 0 0 0 0 1
 symversion=0.1
-T 46200 49900 5 10 1 1 0 0 1
+T 48100 47900 5 10 1 1 0 0 1
 value=1u
-T 46200 49900 5 10 0 1 0 0 1
+T 48100 47900 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-C 40900 41300 1 0 0 capacitor-4.sym
+N 48100 48100 47800 48100 4
+C 42800 44500 1 0 0 capacitor-4.sym
 {
-T 41100 42400 5 10 0 0 0 0 1
+T 43000 45600 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 41100 41800 5 10 1 1 0 0 1
+T 43000 45000 5 10 1 1 0 0 1
 refdes=C303
-T 41100 42000 5 10 0 0 0 0 1
+T 43000 45200 5 10 0 0 0 0 1
 symversion=0.1
-T 40900 41300 5 10 1 1 0 0 1
+T 42800 44500 5 10 1 1 0 0 1
 value=1u
-T 40900 41300 5 10 0 1 0 0 1
+T 42800 44500 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-C 40900 39700 1 0 0 capacitor-4.sym
+C 42800 42900 1 0 0 capacitor-4.sym
 {
-T 41100 40800 5 10 0 0 0 0 1
+T 43000 44000 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 41100 40200 5 10 1 1 0 0 1
+T 43000 43400 5 10 1 1 0 0 1
 refdes=C304
-T 41100 40400 5 10 0 0 0 0 1
+T 43000 43600 5 10 0 0 0 0 1
 symversion=0.1
-T 40900 39700 5 10 1 1 0 0 1
+T 42800 42900 5 10 1 1 0 0 1
 value=1u
-T 40900 39700 5 10 0 1 0 0 1
+T 42800 42900 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-C 48300 46100 1 180 0 resistor-variable-2.sym
+C 50200 48200 1 180 0 resistor-variable-2.sym
 {
-T 47950 46600 5 10 1 1 180 0 1
+T 49850 48700 5 10 1 1 180 0 1
 refdes=R309
-T 47500 45200 5 10 0 1 180 0 1
+T 49400 47300 5 10 0 1 180 0 1
 device=VARIABLE_RESISTOR
-T 47600 46200 5 10 1 1 0 0 1
+T 49500 48300 5 10 1 1 0 0 1
 value=100k?
-T 48300 46100 5 10 0 1 0 0 1
+T 50200 48200 5 10 0 1 0 0 1
 footprint=BOURNS_3296w
 }
-C 47700 45100 1 270 0 resistor-2.sym
+C 49600 47200 1 270 0 resistor-2.sym
 {
-T 48050 44700 5 10 0 0 270 0 1
+T 49950 46800 5 10 0 0 270 0 1
 device=RESISTOR
-T 48000 44600 5 10 1 1 0 0 1
+T 49900 46700 5 10 1 1 0 0 1
 refdes=R310
-T 48000 44400 5 10 1 1 0 0 1
+T 49900 46500 5 10 1 1 0 0 1
 value=22k
-T 47700 45100 5 10 0 1 0 0 1
+T 49600 47200 5 10 0 1 0 0 1
 footprint=R025
 }
-C 47500 43400 1 0 0 vcc-minus-1.sym
-N 47800 45100 47800 45500 4
-N 47800 44000 47800 44200 4
-N 47400 46000 47100 46000 4
-C 48300 43400 1 0 0 vcc-minus-1.sym
-N 48300 46000 48600 46000 4
-N 48600 46000 48600 44000 4
-N 47800 45300 50400 45300 4
-C 51800 45400 1 180 0 input-2.sym
-{
-T 51800 45200 5 10 1 0 180 0 1
-net=SEND:1
-T 51200 44700 5 10 0 0 180 0 1
-device=none
-T 51300 45300 5 10 1 1 180 7 1
-value=melody send
-}
-C 47500 49100 1 90 0 resistor-2.sym
-{
-T 47150 49500 5 10 0 0 90 0 1
-device=RESISTOR
-T 47600 49600 5 10 1 1 0 0 1
-refdes=R311
-T 47600 49400 5 10 1 1 0 0 1
-value=100k
-T 47500 49100 5 10 0 1 0 0 1
-footprint=R025
-}
-C 47100 48400 1 0 0 vcc-minus-1.sym
-N 47100 50100 50400 50100 4
-N 47400 50100 47400 50000 4
-N 47400 49100 47400 49000 4
-C 51800 50200 1 180 0 input-2.sym
-{
-T 51800 50000 5 10 1 0 180 0 1
-net=BLEND_1:1
-T 51200 49500 5 10 0 0 180 0 1
-device=none
-T 51300 50100 5 10 1 1 180 7 1
-value=melody blend w/ return
-}
-T 47100 51500 9 12 1 0 0 0 1
-Buffered outputs
-T 48000 44100 9 10 1 0 0 0 1
+C 49400 45500 1 0 0 vcc-minus-1.sym
+N 49700 47200 49700 47600 4
+N 49700 46100 49700 46300 4
+N 49300 48100 49000 48100 4
+C 50200 45500 1 0 0 vcc-minus-1.sym
+N 50200 48100 50500 48100 4
+N 50500 48100 50500 46100 4
+N 49700 47400 53700 47400 4
+T 49900 46200 9 10 1 0 0 0 1
 taper resistor
-T 48100 46600 9 10 1 0 0 0 1
+T 50000 48700 9 10 1 0 0 0 1
 trim pot to control send level
-C 44100 41300 1 0 0 capacitor-4.sym
+C 46000 44500 1 0 0 capacitor-4.sym
 {
-T 44300 42400 5 10 0 0 0 0 1
+T 46200 45600 5 10 0 0 0 0 1
 device=POLARIZED_CAPACITOR
-T 44300 41800 5 10 1 1 0 0 1
+T 46200 45000 5 10 1 1 0 0 1
 refdes=C305
-T 44300 42000 5 10 0 0 0 0 1
+T 46200 45200 5 10 0 0 0 0 1
 symversion=0.1
-T 44100 41300 5 10 1 1 0 0 1
+T 46000 44500 5 10 1 1 0 0 1
 value=1u
-T 44100 41300 5 10 0 1 0 0 1
+T 46000 44500 5 10 0 1 0 0 1
 footprint=RCY100P
 }
-N 43300 41500 44100 41500 4
-N 45000 41500 45300 41500 4
+N 45200 44700 46000 44700 4
+N 46900 44700 47200 44700 4
+C 55100 48100 1 90 0 stereo_jack-1.sym
+{
+T 53400 48395 5 10 1 1 90 0 1
+refdes=K?
+T 52800 48395 5 10 0 0 90 0 1
+device=CONNECTOR
+T 53200 48395 5 10 0 0 90 0 1
+footprint=Female_Stereo_Conn_3.5mm
+}
+C 54600 47200 1 0 0 vcc-minus-1.sym
+N 54900 47800 54900 48100 4
+N 54000 48100 54300 48100 4
+N 53700 47400 53700 48100 4
+C 57200 46700 1 180 0 input-2.sym
+{
+T 57300 46400 5 10 1 0 180 0 1
+net=MELODY_RETURN:1
+T 56600 46000 5 10 0 0 180 0 1
+device=none
+T 56700 46600 5 10 1 1 180 7 1
+value=MELODY RETURN
+}
+N 54600 48100 54600 46600 4
+N 54600 46600 55800 46600 4