simplify

diff --git a/bin/streaming/telecaster.sh b/bin/streaming/telecaster.sh
new file mode 100755 (executable)
index 0000000..1400c2e
--- /dev/null
+++ b/bin/streaming/telecaster.sh
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+set -e
+
+source /etc/telecaster/telecaster.conf
+
+TELECASTER_PATH=/srv/telecaster/telecaster-server/
+
+# jackd
+
+jackd $JACK_OPTIONS &
+
+sleep 2
+
+# telecaster
+
+konsole &
+
+qjackctl &
+
+sleep 1
+
+/srv/telecaster/telecaster-server/bin/streaming/telecaster.py /etc/telecaster/telecaster.yml &
+
+# JACK ports setup
+
+# STEREO setup
+# 1: L
+# 2: R
+
+#jack_disconnect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1
+#jack_disconnect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2
+
+#jack_disconnect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1
+#jack_disconnect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2
+
+#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1
+#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2
+
+# ADDITIONAL mics
+# 3: C
+
+# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_1
+# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_2
+
+# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1
+# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2
+

diff --git a/bin/streaming/telecaster_start.sh b/bin/streaming/telecaster_start.sh
deleted file mode 100755 (executable)
index 1400c2e..0000000
--- a/bin/streaming/telecaster_start.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-#!/bin/bash
-
-set -e
-
-source /etc/telecaster/telecaster.conf
-
-TELECASTER_PATH=/srv/telecaster/telecaster-server/
-
-# jackd
-
-jackd $JACK_OPTIONS &
-
-sleep 2
-
-# telecaster
-
-konsole &
-
-qjackctl &
-
-sleep 1
-
-/srv/telecaster/telecaster-server/bin/streaming/telecaster.py /etc/telecaster/telecaster.yml &
-
-# JACK ports setup
-
-# STEREO setup
-# 1: L
-# 2: R
-
-#jack_disconnect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1
-#jack_disconnect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2
-
-#jack_disconnect system:capture_1 gst-launch-1.0-01:in_jackaudiosrc0_1
-#jack_disconnect system:capture_2 gst-launch-1.0-01:in_jackaudiosrc0_2
-
-#jack_connect system:capture_1 gst-launch-1.0:in_jackaudiosrc0_1
-#jack_connect system:capture_2 gst-launch-1.0:in_jackaudiosrc0_2
-
-# ADDITIONAL mics
-# 3: C
-
-# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_1
-# jack_connect system:capture_3 gst-launch-1.0:in_jackaudiosrc0_2
-
-# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_1
-# jack_connect system:capture_3 gst-launch-1.0-01:in_jackaudiosrc0_2
-

diff --git a/env/.fluxbox/startup b/env/.fluxbox/startup
index 78569b5a9733fc534608538c8bf5bd027af76a56..8b0ad31dc1994c3e347d020b58298213c79bf6bf 100644 (file)
--- a/env/.fluxbox/startup
+++ b/env/.fluxbox/startup
@@ -23,7 +23,7 @@ if [ $? -eq 0 ]; then
     fbautostart
 fi
 
-/srv/telecaster/telecaster-server/bin/streaming/telecaster_start.sh &
+/srv/telecaster/telecaster-server/bin/streaming/telecaster.sh &
 
 # And last but not least we start fluxbox.
 # Because it is the last app you have to run it with ''exec'' before it.