From: yomguy <yomguy@parisson.com>
Date: Tue, 13 Nov 2012 13:35:33 +0000 (+0100)
Subject: fix startup times and threads
X-Git-Tag: 1.0~18
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7d9f0901fbaa2a2e3107411302ab3c7f8bab1685;p=telecaster-server.git

fix startup times and threads
---

diff --git a/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh
index 6965012..9bf2614 100755
--- a/tcserver/conf/home/fluxbox/autostart.sh
+++ b/tcserver/conf/home/fluxbox/autostart.sh
@@ -1,4 +1,5 @@
 #!/bin/sh
 
-sh ~/.fluxbox/tc_audio_start.sh &
-sh ~/.fluxbox/tc_video_start.sh &
+sh ~/.fluxbox/tc_audio_start.sh
+sh ~/.fluxbox/tc_video_start.sh
+
diff --git a/tcserver/conf/home/fluxbox/tc_audio_start.sh b/tcserver/conf/home/fluxbox/tc_audio_start.sh
index b1fde28..a8e5cd0 100755
--- a/tcserver/conf/home/fluxbox/tc_audio_start.sh
+++ b/tcserver/conf/home/fluxbox/tc_audio_start.sh
@@ -8,7 +8,7 @@ if [ ! $pid = "" ]; then
  sleep 1
 else
  jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 6
+ sleep 3
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
 fi
@@ -20,9 +20,9 @@ edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev
 sleep 3
 
 # MONO setup
-jack_disconnect jack_rack:out_2 LIVE:in_2
+#jack_disconnect jack_rack:out_2 LIVE:in_2
 jack_connect jack_rack:out_1  LIVE:in_1
-jack_connect jack_rack:out_1  LIVE:in_2
+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
 
@@ -32,5 +32,10 @@ jack_connect jack_rack:out_1  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
index 07783ee..1d706b1 100755
--- a/tcserver/conf/home/fluxbox/tc_video_start.sh
+++ b/tcserver/conf/home/fluxbox/tc_video_start.sh
@@ -7,6 +7,15 @@
 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 & 
 
-deefuzzer /etc/telecaster/deefuzzer_video_safe.xml > /dev/null &