merge boot scripts, fix bad threading

diff --git a/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh
index 9bf2614b52789e8661d9aff5ab3abb0ac8614f24..03e9fc62846154e093777b7faf3f4be846289f7e 100755 (executable)
--- a/tcserver/conf/home/fluxbox/autostart.sh
+++ b/tcserver/conf/home/fluxbox/autostart.sh
@@ -1,5 +1,57 @@
 #!/bin/sh
 
-sh ~/.fluxbox/tc_audio_start.sh
-sh ~/.fluxbox/tc_video_start.sh
+#!/bin/sh
+
+pid=`pgrep jack-rack`
+
+# Audio channel
+
+if [ ! $pid = "" ]; then
+ sleep 1
+else
+ jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
+ sleep 6
+ jack_connect system:capture_1 jack_rack:in_1
+ jack_connect system:capture_2 jack_rack:in_2
+fi
+
+qjackctl &
+
+edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
+
+sleep 3
+
+# MONO setup
+#jack_disconnect jack_rack:out_2 LIVE:in_2
+jack_connect jack_rack:out_1  LIVE:in_1
+jack_connect jack_rack:out_2  LIVE:in_2
+#jack_connect jack_rack:out_1  system:playback_1
+#jack_connect jack_rack:out_1  system:playback_2
+
+# STEREO setup
+#jack_connect jack_rack:out_1  LIVE:in_1
+#jack_connect jack_rack:out_2  LIVE:in_2
+#jack_connect jack_rack:out_1  system:playback_1
+#jack_connect jack_rack:out_2  system:playback_2
+
+#VuMeter
+meterbridge -t dpm jack_rack:out_1 jack_rack:out_2 &
+
+# Start safe DeeFuzzer
+deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml &
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh > /dev/null &
+
+sleep 3
+
+jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
+jack_disconnect system:capture_2 gst-launch-0.10:in_jackaudiosrc0_2
+jack_connect    jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+jack_connect    jack_rack:out_2  gst-launch-0.10:in_jackaudiosrc0_2
+
+deefuzzer /etc/telecaster/deefuzzer_video_safe.xml &
+
 

diff --git a/tcserver/conf/home/fluxbox/tc_audio_start.sh b/tcserver/conf/home/fluxbox/tc_audio_start.sh
deleted file mode 100755 (executable)
index a8e5cd0..0000000
--- a/tcserver/conf/home/fluxbox/tc_audio_start.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/sh
-
-pid=`pgrep jack-rack`
-
-# Audio channel
-
-if [ ! $pid = "" ]; then
- sleep 1
-else
- jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 3
- jack_connect system:capture_1 jack_rack:in_1
- jack_connect system:capture_2 jack_rack:in_2
-fi
-
-qjackctl &
-
-edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
-
-sleep 3
-
-# MONO setup
-#jack_disconnect jack_rack:out_2 LIVE:in_2
-jack_connect jack_rack:out_1  LIVE:in_1
-jack_connect jack_rack:out_2  LIVE:in_2
-#jack_connect jack_rack:out_1  system:playback_1
-#jack_connect jack_rack:out_1  system:playback_2
-
-# STEREO setup
-#jack_connect jack_rack:out_1  LIVE:in_1
-#jack_connect jack_rack:out_2  LIVE:in_2
-#jack_connect jack_rack:out_1  system:playback_1
-#jack_connect jack_rack:out_2  system:playback_2
-
-#VuMeter
-meterbridge -t dpm jack_rack:out_1 jack_rack:out_2 &
-
-sleep 3
-
-# Start safe DeeFuzzer
-deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml > /dev/null &

diff --git a/tcserver/conf/home/fluxbox/tc_video_start.sh b/tcserver/conf/home/fluxbox/tc_video_start.sh
deleted file mode 100755 (executable)
index 1d706b1..0000000
--- a/tcserver/conf/home/fluxbox/tc_video_start.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# Start TeleCaster video channel
-
-/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh > /dev/null &
-
-sleep 3
-
-jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
-jack_disconnect system:capture_2 gst-launch-0.10:in_jackaudiosrc0_2
-jack_connect    jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
-jack_connect    jack_rack:out_2  gst-launch-0.10:in_jackaudiosrc0_2
-
-sleep 3
-
-deefuzzer /etc/telecaster/deefuzzer_video_safe.xml > /dev/null &
-
-# DEBUG 
-# sleep 5
-# deefuzzer /home/telecaster/.telecaster/deefuzzer_webm.xml > /dev/null & 
-