From: Guillaume Pellerin Date: Mon, 8 Dec 2014 13:36:38 +0000 (+0100) Subject: fix fluxbox X-Git-Tag: 1.0~2^2~8 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e6585240b5f4ba4c80d9064cc18d25ebe7027aa3;p=telecaster-server.git fix fluxbox --- diff --git a/conf/home/telecaster/.fluxbox/autostart.sh b/conf/home/telecaster/.fluxbox/autostart.sh index 2e14cff..b5eae30 100755 --- a/conf/home/telecaster/.fluxbox/autostart.sh +++ b/conf/home/telecaster/.fluxbox/autostart.sh @@ -74,83 +74,5 @@ deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml & sleep 3 #Wathdog for trash -python scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com & - -#!/bin/sh - -# --------------------- -# Audio channel -# --------------------- - -pid=`pgrep jack-rack` - - -if [ ! $pid = "" ]; then - sleep 1 -else - jack-rack -n /etc/telecaster/jack-rack/eq_comp_limit_02.rack > /dev/null & - sleep 3 -fi - -jack_connect system:capture_1 jack_rack:in_1 -jack_connect system:capture_2 jack_rack:in_2 - -qjackctl & - -scripts/tc_audio_mp3_icecast.sh & -#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & - -sleep 2 - -# MONO -#jack_connect jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_2 -#jack_connect jack_rack:out_1 system:playback_1 -#jack_connect jack_rack:out_1 system:playback_2 - -# STEREO setup -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 - -#jack_connect jack_rack:out_1 lamemp3enc:in_1 -#jack_connect jack_rack:out_2 lamemp3enc:in_2 -#jack_connect jack_rack:out_1 system:playback_1 -#jack_connect jack_rack:out_2 system:playback_2 - -# 4 channels setup -#jack_connect system:capture_1 jack_rack:in_1 -#jack_connect system:capture_1 jack_rack:in_2 -#jack_connect system:capture_2 jack_rack:in_1 -#jack_connect system:capture_2 jack_rack:in_2 -#jack_connect system:capture_3 jack_rack:in_1 -#jack_connect system:capture_4 jack_rack:in_2 - -# --------------------- -# Video channel -# --------------------- - -scripts/tc_video_simple_webm_stream.sh & - -sleep 2 - -jack_disconnect system:capture_1 gst-launch-0.10-01:in_jackaudiosrc0_1 -jack_disconnect system:capture_2 gst-launch-0.10-01:in_jackaudiosrc0_2 - -jack_connect jack_rack:out_1 gst-launch-0.10-01:in_jackaudiosrc0_1 -jack_connect jack_rack:out_2 gst-launch-0.10-01:in_jackaudiosrc0_2 - -sleep 1 - -#Audio monitor -deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml & - -#Video monitor -deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml & - -sleep 3 - -#Wathdog for trash -python scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com & +scripts/monitor_check.py 10 /home/telecaster/trash/webm/ smtp.icp.fr informatique@icp.fr alerts@parisson.com & diff --git a/conf/home/telecaster/.fluxbox/scripts/monitor_check.py b/conf/home/telecaster/.fluxbox/scripts/monitor_check.py old mode 100644 new mode 100755