]> git.parisson.com Git - telecaster-server.git/commitdiff
fix startup times and threads
authoryomguy <yomguy@parisson.com>
Tue, 13 Nov 2012 13:35:33 +0000 (14:35 +0100)
committeryomguy <yomguy@parisson.com>
Tue, 13 Nov 2012 13:35:33 +0000 (14:35 +0100)
tcserver/conf/home/fluxbox/autostart.sh
tcserver/conf/home/fluxbox/tc_audio_start.sh
tcserver/conf/home/fluxbox/tc_video_start.sh

index 69650125112eeae71029bd8af93f2c04db1d2802..9bf2614b52789e8661d9aff5ab3abb0ac8614f24 100755 (executable)
@@ -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
+
index b1fde2848be8effd40f98aef8d45046d80583ca1..a8e5cd097fcddc5c880f0e5ae6ec7934b5eb50c0 100755 (executable)
@@ -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 &
index 07783ee32b79dd344cb9d435f5e0d9b32b7c2399..1d706b1f43ebc8c5e09b2688917a5126f702d697 100755 (executable)
@@ -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 &