use icecast for monitoring

diff --git a/src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml b/src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
index 8f7e1fd70ef0b1ce3758907bc2d772584dec7778..18885ee7063004d89117e3068d3b832fbec18df8 100644 (file)
--- a/src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
+++ b/src/etc/telecaster/deefuzzer/telecaster_mp3_monitor.yaml
@@ -6,7 +6,7 @@ deefuzzer:
     infos: {description: TeleCaster MP3 monitor,
             genre: Vocal,
             name: telecaster_mp3_monitor,
-            url: 'http://parisson.com.com'}
+            url: 'https://www.parisson.com'}
     jingles: {dir: /path/to/jingles, mode: 0, shuffle: 1}
     media: {bitrate: 96,
             dir: /usr/local/share/telecaster/media/mp3,
@@ -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: monitor,
+    server: {host: 127.0.0.1, mountpoint: monitor.mp3,
              port: 8000, public: 0,
              sourcepassword: source2parisson, type: icecast}
     twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,

diff --git a/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml b/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
index 7785f9df401fd1ffa78bf3b57b842605ebc05637..8d484a199a08e3e34edd1685f7f6769f15aec93b 100644 (file)
--- a/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
+++ b/src/etc/telecaster/deefuzzer/telecaster_webm_monitor.yaml
@@ -4,14 +4,14 @@ deefuzzer:
   station:
     control: {mode: 1, port: 16002}
     infos: {description: TeleCaster WebM monitor stream, genre: Vocal, name: monitor, short_name: monitor,
-      url: 'http://parisson.com.com'}
+      url: 'https://www.parisson.com'}
     jingles: {dir: /path/to/jingles, mode: '0', shuffle: '0'}
     media: {bitrate: '512', dir: /usr/local/share/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/'}
+    relay: {author: TeleCaster, mode: '1', url: 'http://127.0.0.1:8000/telecaster_live.webm'}
     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}
+      type: icecast, mountpoint: monitor.webm}
     twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE, mode: '0', secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
       tags: bla bla}

diff --git a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
index c2c74ae5e6729eda62c5be1c0ea2bd35d2a097fd..b46a0dea86fda84d661031226922fc78052d345b 100755 (executable)
--- a/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
+++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream-gst1.sh
@@ -54,5 +54,5 @@ gst-launch-1.0 v4l2src device=/dev/video$V4L2_ID ! video/x-raw, format=YUY2, wid
        ! queue ! opusenc bitrate=$AUDIO_OPUS_BITRATE \
        ! queue ! muxout. \
        webmmux streamable=true name=muxout \
-       ! queue ! tcpserversink host=127.0.0.1 port=9000 blocksize=65536 sync-method=1 \
+       ! queue ! shout2send ip=127.0.0.1 port=8000 password=source2parisson mount=telecaster_live.webm
        > /dev/null