From af68e76744a22c89ba14603ad63b9b4ac2706eff Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 15 Jul 2013 23:17:41 +0200 Subject: [PATCH] BIG refactor of app confs and programs, rm rotate-desktop script --- tcserver/conf/etc/init.d/telecaster | 39 ++++++------ .../telecaster_mp3_default.xml} | 0 .../telecaster_mp3_monitor.yaml | 8 +-- .../telecaster_webm_default.xml} | 0 .../deefuzzer/telecaster_webm_monitor.yaml | 17 +++++ .../{ => jack-rack}/eq_comp_limit_02.rack | Bin .../{ => jack-rack}/eq_comp_limit_02_old.rack | Bin .../{ => old}/edcast_jack_local.cfg | 0 .../{ => old}/edcast_jack_local_mp3.cfg | 0 .../{ => old}/edcast_jack_local_ogg.cfg | 0 .../etc/telecaster/{ => old}/telecaster.xml | 0 .../telecaster/{ => old}/telecaster_mp3.xml | 0 .../telecaster/{ => old}/telecaster_ogg.xml | 0 .../{ => old}/telecaster_parisson_mp3.xml | 0 .../telecaster/{ => old}/telecaster_pb.xml | 0 .../telecaster/telecaster_webm_monitor.yaml | 17 ----- .../etc/telecaster/{ => tests}/deefuzzer.xml | 0 .../{ => tests}/deefuzzer_audio_safe.xml | 0 .../telecaster/{ => tests}/deefuzzer_ogg.xml | 0 .../telecaster/{ => tests}/deefuzzer_safe.xml | 0 .../{ => tests}/deefuzzer_safe_mp3.xml | 0 .../{ => tests}/deefuzzer_safe_ogg.xml | 0 .../{ => tests}/deefuzzer_video.xml | 0 .../{ => tests}/deefuzzer_video_local.xml | 0 .../{ => tests}/deefuzzer_video_safe.xml | 0 .../{ => tests}/telecaster_audio_monitor.xml | 0 .../tests/telecaster_audio_monitor2.yaml | 17 +++++ tcserver/conf/home/bin/rotate_desktop | 12 ---- tcserver/conf/home/fluxbox/autostart.sh | 58 +++++++++++++++++- tcserver/conf/home/fluxbox/tc_audio_start.sh | 37 ----------- tcserver/conf/home/fluxbox/tc_video_start.sh | 12 ---- tcserver/conf/usr/local/bin/rotate_desktop | 12 ---- .../scripts/tc_video_simple_webm_stream.sh | 3 +- .../scripts/{test => tests}/gst_dv_jack_shout | 0 .../scripts/{test => tests}/gst_osc_multi.py | 0 .../{test => tests}/gst_video_double_shout | 0 .../gst_video_double_shout2.sh | 0 .../{test => tests}/gst_video_jack_fifo_shout | 0 .../{test => tests}/gst_video_jack_shout | 0 .../{test => tests}/gst_video_simple_ogg | 0 .../{test => tests}/gst_video_simple_ogg_jack | 0 .../{test => tests}/gst_video_triple_shout | 0 .../scripts/tests/osc_record_start.py | 16 +++++ .../scripts/tests/osc_record_stop.py | 16 +++++ .../scripts/{test => tests}/rtpx264.sh | 0 .../scripts/{test => tests}/rtpx264_pl.sh | 0 .../{test => tests}/tc_flu_simple_webm.sh | 0 .../tc_video_alsa_webm_stream.sh | 0 .../tc_video_dv_webm_stream.sh | 0 .../tc_video_only_simple_webm.sh | 0 .../{test => tests}/tc_video_simple_file.sh | 0 .../tc_video_simple_file_webm.sh | 0 .../{test => tests}/tc_video_simple_start.sh | 0 .../tc_video_simple_webm_ice.sh | 0 .../tests/tc_video_simple_webm_stream.sh | 15 +++++ .../tc_video_simple_webm_stream_hd.sh | 0 ...c_video_simple_webm_stream_hd_alsa_test.sh | 0 ...c_video_simple_webm_stream_hd_jack_test.sh | 0 .../tc_video_simple_webm_stream_hd_test.sh | 0 .../tc_video_simple_webm_stream_m.sh | 0 .../tc_video_simple_webm_stream_sd_test.sh | 0 .../tc_video_simple_webm_tee.sh | 0 .../scripts/{test => tests}/tcp2x.sh | 0 .../scripts/{test => tests}/x264_2.sh | 0 .../scripts/{test => tests}/x264_pl2.sh | 0 .../scripts/{test => tests}/x264_relay.sh | 0 .../scripts/{test => tests}/x264_relay_x.sh | 0 .../scripts/{test => tests}/x_jack_webm.sh | 0 tcserver/install.py | 9 +-- 69 files changed, 163 insertions(+), 125 deletions(-) rename tcserver/conf/etc/telecaster/{deefuzzer_mp3.xml => deefuzzer/telecaster_mp3_default.xml} (100%) rename tcserver/conf/etc/telecaster/{ => deefuzzer}/telecaster_mp3_monitor.yaml (81%) rename tcserver/conf/etc/telecaster/{deefuzzer_webm.xml => deefuzzer/telecaster_webm_default.xml} (100%) create mode 100644 tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml rename tcserver/conf/etc/telecaster/{ => jack-rack}/eq_comp_limit_02.rack (100%) rename tcserver/conf/etc/telecaster/{ => jack-rack}/eq_comp_limit_02_old.rack (100%) rename tcserver/conf/etc/telecaster/{ => old}/edcast_jack_local.cfg (100%) rename tcserver/conf/etc/telecaster/{ => old}/edcast_jack_local_mp3.cfg (100%) rename tcserver/conf/etc/telecaster/{ => old}/edcast_jack_local_ogg.cfg (100%) rename tcserver/conf/etc/telecaster/{ => old}/telecaster.xml (100%) rename tcserver/conf/etc/telecaster/{ => old}/telecaster_mp3.xml (100%) rename tcserver/conf/etc/telecaster/{ => old}/telecaster_ogg.xml (100%) rename tcserver/conf/etc/telecaster/{ => old}/telecaster_parisson_mp3.xml (100%) rename tcserver/conf/etc/telecaster/{ => old}/telecaster_pb.xml (100%) delete mode 100644 tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_audio_safe.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_ogg.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_safe.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_safe_mp3.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_safe_ogg.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_video.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_video_local.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/deefuzzer_video_safe.xml (100%) rename tcserver/conf/etc/telecaster/{ => tests}/telecaster_audio_monitor.xml (100%) create mode 100644 tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml delete mode 100755 tcserver/conf/home/bin/rotate_desktop delete mode 100755 tcserver/conf/home/fluxbox/tc_audio_start.sh delete mode 100755 tcserver/conf/home/fluxbox/tc_video_start.sh delete mode 100755 tcserver/conf/usr/local/bin/rotate_desktop rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_dv_jack_shout (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_osc_multi.py (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_double_shout (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_double_shout2.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_jack_fifo_shout (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_jack_shout (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_simple_ogg (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_simple_ogg_jack (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/gst_video_triple_shout (100%) create mode 100755 tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py create mode 100755 tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/rtpx264.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/rtpx264_pl.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_flu_simple_webm.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_alsa_webm_stream.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_dv_webm_stream.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_only_simple_webm.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_file.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_file_webm.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_start.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_ice.sh (100%) create mode 100755 tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_hd.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_hd_alsa_test.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_hd_jack_test.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_hd_test.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_m.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_stream_sd_test.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tc_video_simple_webm_tee.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/tcp2x.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/x264_2.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/x264_pl2.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/x264_relay.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/x264_relay_x.sh (100%) rename tcserver/conf/usr/local/share/telecaster/scripts/{test => tests}/x_jack_webm.sh (100%) diff --git a/tcserver/conf/etc/init.d/telecaster b/tcserver/conf/etc/init.d/telecaster index f087c80..fdb02ad 100755 --- a/tcserver/conf/etc/init.d/telecaster +++ b/tcserver/conf/etc/init.d/telecaster @@ -14,15 +14,15 @@ USER= OPTIONS="" LOG=/var/log/vncserver.log PIDFILE=/var/run/vncserver.pid -PORT=1 +PORT=2 -test -f /etc/default/vncserver || exit 0 -. /etc/default/vncserver +test -f /etc/default/telecaster || exit 0 +. /etc/default/telecaster VNCHOME=/home/$USER if [ ! "x$START_DAEMON" = "xyes" -a ! "$1" = "stop" ]; then - echo "Edit /etc/default/vncserver to start vncserver" + echo "Edit /etc/default/telecaster to start telecaster vncserver" exit 0 fi @@ -31,28 +31,27 @@ test -f $DAEMON || exit 0 . /lib/lsb/init-functions case "$1" in - start) - log_begin_msg "Starting vncserver audio server:" "vncserver" - echo $DAEMON $OPTIONS :$PORT' &' > $VNCHOME/.vncserverinit - chmod +x $VNCHOME/.vncserverinit - su -c $VNCHOME/.vncserverinit $USER > ${LOG} - sleep 2 - pid=`pgrep -u ${USER} vncserver` + start) + log_begin_msg "Starting telecaster streaming vncserver:" "telecaster" + su -c "$DAEMON $OPTIONS :$PORT > $LOG &" $USER + sleep 20 + deefuzzer /etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml > /dev/null & + deefuzzer /etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml > /dev/null & + pid=`pgrep -u ${USER} vncserver` if [ pid = '' ]; then - log_failure_msg "Vncserver daemon can't be started! Check logfile: ${LOG}" + log_failure_msg "TeleCaster daemon can't be started! Check logfile: $LOG" else echo $pid > $PIDFILE fi - + ;; stop) - log_begin_msg "Stopping vncserver audio server:" "vncserver" - pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` + log_begin_msg "Stopping telecaster streaming vncserver:" "telecaster" + pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` if [ ! pid = '' ]; then - su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml\" " - su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_video_safe.xml\" " - su -c "pkill -9 edcast_jack" $USER - su -c "pkill -9 gst-launch-0.10" $USER + su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_mp3_monitor.yaml\" " + su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_webm_monitor.yaml\" " + su -c "pkill -9 gst-launch-0.10" $USER sleep 1 su -c "vncserver -kill :$PORT" $USER log_end_msg 0 @@ -75,7 +74,7 @@ case "$1" in ;; *) - log_warning_msg "Usage: /etc/init.d/vncserver {start|stop|restart|force-reload|awaken|debug-run}" + log_warning_msg "Usage: /etc/init.d/telecaster {start|stop|restart|force-reload|awaken|debug-run}" log_warning_msg " start - starts system-wide vncserver service" log_warning_msg " stop - stops system-wide vncserver service" log_warning_msg " restart, force-reload - starts a new system-wide vncserver service" diff --git a/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_mp3.xml rename to tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_default.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml similarity index 81% rename from tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml rename to tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml index c69d48c..e370f91 100644 --- a/tcserver/conf/etc/telecaster/telecaster_mp3_monitor.yaml +++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml @@ -1,8 +1,8 @@ deefuzzer: - log: /var/log/telecaster/telecaster_audio_monitor.log - m3u: /var/www/m3u/telecaster_audio_monitor.m3u + log: /var/log/telecaster/telecaster_mp3_monitor.log + m3u: /var/www/m3u/telecaster_mp3_monitor.m3u station: - control: {mode: 0, port: 16001} + control: {mode: 1, port: 16001} infos: {description: TeleCaster MP3 monitor, genre: Vocal, name: telecaster_mp3_monitor, @@ -17,7 +17,7 @@ deefuzzer: url: 'http://127.0.0.1:8000/telecaster_live.mp3'} rss: {dir: /var/www/rss, enclosure: 0, media_url: 'http://localhost/rss/'} - server: {host: 127.0.0.1, mountpoint: telecaster_mp3_monitor, + server: {host: 127.0.0.1, mountpoint: monitor, port: 8000, public: 0, sourcepassword: source2parisson, type: icecast} twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, diff --git a/tcserver/conf/etc/telecaster/deefuzzer_webm.xml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_webm.xml rename to tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_default.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml new file mode 100644 index 0000000..0c7e3e9 --- /dev/null +++ b/tcserver/conf/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml @@ -0,0 +1,17 @@ +deefuzzer: + log: /var/log/telecaster/telecaster_webm_monitor.log + m3u: /var/www/m3u/telecaster_webm_monitor.m3u + station: + control: {mode: 1, port: 16002} + infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor, short_name: monitor, + url: 'http://parisson.com.com'} + jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'} + media: {bitrate: '512', dir: /home/telecaster/media/webm, format: webm, ogg_quality: '4', + samplerate: '48000', shuffle: '0', voices: '1'} + record: {dir: /home/telecaster/trash/webm, mode: 1} + relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:9000/'} + rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://localhost/rss/'} + server: {host: 127.0.0.1, port: '8080', public: '0', sourcepassword: source2parisson, + type: stream-m, mountpoint: monitor} + twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4, + tags: bla bla} diff --git a/tcserver/conf/etc/telecaster/eq_comp_limit_02.rack b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack similarity index 100% rename from tcserver/conf/etc/telecaster/eq_comp_limit_02.rack rename to tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02.rack diff --git a/tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack b/tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack similarity index 100% rename from tcserver/conf/etc/telecaster/eq_comp_limit_02_old.rack rename to tcserver/conf/etc/telecaster/jack-rack/eq_comp_limit_02_old.rack diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/edcast_jack_local.cfg rename to tcserver/conf/etc/telecaster/old/edcast_jack_local.cfg diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/edcast_jack_local_mp3.cfg rename to tcserver/conf/etc/telecaster/old/edcast_jack_local_mp3.cfg diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg b/tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg similarity index 100% rename from tcserver/conf/etc/telecaster/edcast_jack_local_ogg.cfg rename to tcserver/conf/etc/telecaster/old/edcast_jack_local_ogg.cfg diff --git a/tcserver/conf/etc/telecaster/telecaster.xml b/tcserver/conf/etc/telecaster/old/telecaster.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster.xml rename to tcserver/conf/etc/telecaster/old/telecaster.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_mp3.xml b/tcserver/conf/etc/telecaster/old/telecaster_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster_mp3.xml rename to tcserver/conf/etc/telecaster/old/telecaster_mp3.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_ogg.xml b/tcserver/conf/etc/telecaster/old/telecaster_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster_ogg.xml rename to tcserver/conf/etc/telecaster/old/telecaster_ogg.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml b/tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster_parisson_mp3.xml rename to tcserver/conf/etc/telecaster/old/telecaster_parisson_mp3.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_pb.xml b/tcserver/conf/etc/telecaster/old/telecaster_pb.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster_pb.xml rename to tcserver/conf/etc/telecaster/old/telecaster_pb.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml b/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml deleted file mode 100644 index 1df5cee..0000000 --- a/tcserver/conf/etc/telecaster/telecaster_webm_monitor.yaml +++ /dev/null @@ -1,17 +0,0 @@ -deefuzzer: - log: /var/log/deefuzzer/telecaster_video_safe.log - m3u: /var/www/m3u/telecaster_video_safe.m3u - station: - control: {mode: '0', port: '16002'} - infos: {description: TeleCaster safe video stream, genre: Vocal, name: safe, short_name: safe, - url: 'http://parisson.com.com'} - jingles: {dir: /path/to/jingles, mode: '0', shuffle: '1'} - media: {bitrate: '64', dir: /home/telecaster/media/webm, format: webm, ogg_quality: '4', - samplerate: '48000', shuffle: '0', voices: '1'} - record: {dir: /home/telecaster/trash/webm, mode: '1'} - relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:9000/'} - rss: {dir: /var/www/rss, enclosure: '0', media_url: 'http://my.domain.com/rss/'} - server: {host: 127.0.0.1, port: '8080', public: '0', sourcepassword: source2parisson, - type: stream-m} - twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4, - tags: bla bla} diff --git a/tcserver/conf/etc/telecaster/deefuzzer.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_audio_safe.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_audio_safe.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_ogg.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_ogg.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_ogg.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_safe.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_safe.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_safe_mp3.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_safe_mp3.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_safe_ogg.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_safe_ogg.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_video.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_video.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video_local.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_video_local.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_video_local.xml diff --git a/tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml b/tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml similarity index 100% rename from tcserver/conf/etc/telecaster/deefuzzer_video_safe.xml rename to tcserver/conf/etc/telecaster/tests/deefuzzer_video_safe.xml diff --git a/tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml similarity index 100% rename from tcserver/conf/etc/telecaster/telecaster_audio_monitor.xml rename to tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor.xml diff --git a/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml new file mode 100644 index 0000000..9fcfcea --- /dev/null +++ b/tcserver/conf/etc/telecaster/tests/telecaster_audio_monitor2.yaml @@ -0,0 +1,17 @@ +deefuzzer: + log: /var/log/telecaster/telecaster_audio_monitor.log + m3u: /var/www/m3u/telecaster_audio_monitor.m3u + station: + control: {mode: 0, port: 1237} + infos: {description: TeleCaster MP3 monitor, genre: Vocal, name: telecaster_mp3_monitor, + url: 'http://parisson.com.com'} + jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1} + media: {bitrate: 96, dir: /home/telecaster/media/mp3, format: mp3, ogg_quality: 4, + samplerate: 48000, shuffle: 0, voices: '2'} + record: {dir: /home/telecaster/trash/mp3, mode: 1} + relay: {author: Inconnu, mode: 1, url: 'http://127.0.0.1:8000/telecaster_live.mp3'} + rss: {dir: /var/www/rss, enclosure: 0, media_url: 'http://my.domain.com/rss/'} + server: {host: 127.0.0.1, mountpoint: telecaster_mp3_monitor2, port: 8000, public: 0, + sourcepassword: source2parisson, type: icecast} + twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4, + tags: bla bla} diff --git a/tcserver/conf/home/bin/rotate_desktop b/tcserver/conf/home/bin/rotate_desktop deleted file mode 100755 index 3e6abf8..0000000 --- a/tcserver/conf/home/bin/rotate_desktop +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -xrandrout="$(xrandr)" - -case $xrandrout in - *1024x600+0+0\ inverted\ \(* ) rotate=0; invert=0;; - *1024x600+0+0\ \(* ) rotate=2; invert=1;; -esac - -xrandr -o $rotate -xinput --set-prop 11 "Evdev Axis Inversion" $invert, $invert - diff --git a/tcserver/conf/home/fluxbox/autostart.sh b/tcserver/conf/home/fluxbox/autostart.sh index 6965012..585bc4d 100755 --- a/tcserver/conf/home/fluxbox/autostart.sh +++ b/tcserver/conf/home/fluxbox/autostart.sh @@ -1,4 +1,58 @@ #!/bin/sh -sh ~/.fluxbox/tc_audio_start.sh & -sh ~/.fluxbox/tc_video_start.sh & +# --------------------- +# Audio channel +# --------------------- + +pid=`pgrep jack-rack` + + +if [ ! $pid = "" ]; then + sleep 1 +else + jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null & + sleep 6 +fi + +jack_connect system:capture_1 jack_rack:in_1 +jack_connect system:capture_2 jack_rack:in_2 + +qjackctl & + +/usr/local/share/telecaster/scripts/telecaster/tc_audio_mp3_icecast.sh & +#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & + +sleep 3 + +# MONO setup +#jack_disconnect jack_rack:out_2 lamemp3enc:in_jackaudiosrc0_1 +jack_connect jack_rack:out_1 lamemp3enc:in_jackaudiosrc0_1 +#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_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 +# --------------------- + +/usr/local/share/telecaster/scripts/telecaster/tc_video_simple_webm_stream.sh & + +sleep 3 + +jack_disconnect system:capture_1 webmenc:in_jackaudiosrc0_1 +jack_connect jack_rack:out_1 webmenc:in_jackaudiosrc0_1 + 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 59a7c31..0000000 --- a/tcserver/conf/home/fluxbox/tc_audio_start.sh +++ /dev/null @@ -1,37 +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 6 - jack_connect system:capture_1 jack_rack:in_1 - jack_connect system:capture_2 jack_rack:in_2 -fi - -qjackctl & - -/usr/local/share/telecaster/scripts/tc_audio_mp3_icecast.sh & -#edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n lamemp3enc -p jack_rack > /dev/null & - -sleep 3 - -# MONO setup -jack_disconnect jack_rack:out_2 lamemp3enc:in_2 -jack_connect jack_rack:out_1 lamemp3enc:in_1 -jack_connect jack_rack:out_1 lamemp3enc: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 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 - -# Start safe DeeFuzzer -deefuzzer /etc/telecaster/telecaster_mp3_monitor.yaml > /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 f313342..0000000 --- a/tcserver/conf/home/fluxbox/tc_video_start.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -# Start TeleCaster video channel - -/usr/local/share/telecaster/scripts/telecaster/tc_video_simple_webm_stream.sh & - -sleep 3 - -jack_disconnect system:capture_1 webmenc:in_jackaudiosrc0_1 -jack_connect jack_rack:out_1 webmenc:in_jackaudiosrc0_1 - -deefuzzer /etc/telecaster/telecaster_webm_monitor.yaml > /dev/null & diff --git a/tcserver/conf/usr/local/bin/rotate_desktop b/tcserver/conf/usr/local/bin/rotate_desktop deleted file mode 100755 index 3e6abf8..0000000 --- a/tcserver/conf/usr/local/bin/rotate_desktop +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -xrandrout="$(xrandr)" - -case $xrandrout in - *1024x600+0+0\ inverted\ \(* ) rotate=0; invert=0;; - *1024x600+0+0\ \(* ) rotate=2; invert=1;; -esac - -xrandr -o $rotate -xinput --set-prop 11 "Evdev Axis Inversion" $invert, $invert - diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh index 5753f72..3fee7a6 100755 --- a/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh +++ b/tcserver/conf/usr/local/share/telecaster/scripts/tc_video_simple_webm_stream.sh @@ -9,7 +9,7 @@ HEIGHT=360 v4l2-ctl -d 1 -c power_line_frequency=1 -gst-launch v4l2src device=/dev/video1 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT, framerate={24/1} \ +gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT, framerate={30/1} \ ! queue ! ffmpegcolorspace \ ! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=96 auto-alt-ref-frames=true ! queue ! muxout. \ jackaudiosrc connect=2 client-name=webmenc ! audio/x-raw-float, channels=2 \ @@ -17,4 +17,3 @@ gst-launch v4l2src device=/dev/video1 ! video/x-raw-rgb, width=$WIDTH, height=$H webmmux streamable=true name=muxout \ ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \ > /dev/null - diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_dv_jack_shout rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_dv_jack_shout diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_osc_multi.py rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_osc_multi.py diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout2.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_double_shout2.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_double_shout2.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_fifo_shout rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_fifo_shout diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_jack_shout rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_jack_shout diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_simple_ogg_jack rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_simple_ogg_jack diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout b/tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/gst_video_triple_shout rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/gst_video_triple_shout diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py new file mode 100755 index 0000000..12356a4 --- /dev/null +++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_start.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import liblo, sys + +port = int(sys.argv[-1]) + +# send all messages to port 1234 on the local machine +try: + target = liblo.Address(port) +except liblo.AddressError, err: + print str(err) + sys.exit() + +# send message "/foo/message1" with int, float and string arguments +liblo.send(target, "/record", 1) diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py new file mode 100755 index 0000000..81da1a1 --- /dev/null +++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/osc_record_stop.py @@ -0,0 +1,16 @@ +#!/usr/bin/env python +# -*- coding: utf-8 -*- + +import liblo, sys + +port = int(sys.argv[-1]) + +# send all messages to port 1234 on the local machine +try: + target = liblo.Address(port) +except liblo.AddressError, err: + print str(err) + sys.exit() + +# send message "/foo/message1" with int, float and string arguments +liblo.send(target, "/record", 0) diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/rtpx264_pl.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/rtpx264_pl.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_flu_simple_webm.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_flu_simple_webm.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_alsa_webm_stream.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_alsa_webm_stream.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_dv_webm_stream.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_dv_webm_stream.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_only_simple_webm.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_only_simple_webm.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_file_webm.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_file_webm.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_start.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_start.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_ice.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_ice.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh new file mode 100755 index 0000000..d41d76f --- /dev/null +++ b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +# Start TeleCaster video channel + +WIDTH=640 +HEIGHT=480 + +gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$HEIGHT, framerate={30/1} \ + ! queue ! ffmpegcolorspace \ + ! queue ! vp8enc speed=2 threads=4 quality=7.0 max-latency=2 max-keyframe-distance=3 auto-alt-ref-frames=true ! queue ! muxout. \ + jackaudiosrc connect=2 client-name=webmenc ! audio/x-raw-float, channels=2 \ + ! queue ! audioconvert ! queue ! vorbisenc quality=0.3 ! queue ! muxout. \ + webmmux streamable=true name=muxout \ + ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 + diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_alsa_test.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_alsa_test.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_jack_test.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_jack_test.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_hd_test.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_hd_test.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_m.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_m.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_stream_sd_test.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_stream_sd_test.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tc_video_simple_webm_tee.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tc_video_simple_webm_tee.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/tcp2x.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/tcp2x.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/x264_2.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_2.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/x264_pl2.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_pl2.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/x264_relay_x.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/x264_relay_x.sh diff --git a/tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh b/tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh similarity index 100% rename from tcserver/conf/usr/local/share/telecaster/scripts/test/x_jack_webm.sh rename to tcserver/conf/usr/local/share/telecaster/scripts/tests/x_jack_webm.sh diff --git a/tcserver/install.py b/tcserver/install.py index 040ea49..22cbda0 100644 --- a/tcserver/install.py +++ b/tcserver/install.py @@ -62,7 +62,6 @@ class Install(object): self.rss_dir = '/var/www/rss' self.m3u_dir = '/var/www/m3u' self.log_dir = '/var/log/telecaster' - self.deefuzzer_log_dir = '/var/log/deefuzzer' self.conf_dir = '/etc/telecaster' self.stream_m_conf_dir = '/etc/stream-m' self.init_dirs = ['/etc/init.d/', '/etc/default/'] @@ -79,10 +78,6 @@ class Install(object): os.system('chown -R ' + self.user + ':' + self.user + ' ' + dir) def install_deps(self): - # compiling edcast-jack - os.chdir(self.app_dir + '/lib/edcast-jack') - os.system('./configure; make; make install') - # Install Stream-m os.chdir(self.app_dir) os.system('cp -ra lib/stream-m /usr/local/lib/') @@ -118,7 +113,7 @@ class Install(object): def install_init(self): os.chdir(self.app_dir) - dirs = [self.rss_dir, self.m3u_dir, self.log_dir, self.deefuzzer_log_dir, self.conf_dir, self.stream_m_conf_dir] + dirs = [self.rss_dir, self.m3u_dir, self.log_dir, self.conf_dir, self.stream_m_conf_dir] for dir in dirs: if not os.path.exists(dir): os.makedirs(dir) @@ -142,7 +137,7 @@ class Install(object): if not os.path.islink(init_link): os.system('ln -s /etc/init.d/stream-m '+init_link) - os.system('cp -r conf/usr/* /usr/') + os.system('cp -ra conf/usr/* /usr/') def run(self): if self.options['keepinit'] == False: -- 2.39.5