From 1a725f66f8d9d76c6f7504a3370a9dc959ad433e Mon Sep 17 00:00:00 2001 From: yomguy Date: Fri, 16 Nov 2012 13:51:38 +0100 Subject: [PATCH] merge boot scripts, fix bad threading --- tcserver/conf/home/fluxbox/autostart.sh | 56 +++++++++++++++++++- tcserver/conf/home/fluxbox/tc_audio_start.sh | 41 -------------- tcserver/conf/home/fluxbox/tc_video_start.sh | 21 -------- 3 files changed, 54 insertions(+), 64 deletions(-) delete mode 100755 tcserver/conf/home/fluxbox/tc_audio_start.sh delete mode 100755 tcserver/conf/home/fluxbox/tc_video_start.sh diff --git a/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh index 9bf2614..03e9fc6 100755 --- 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 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 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 & - -- 2.39.5