add video live safe record

diff --git a/conf/etc/telecaster/deefuzzer_audio_safe.xml b/conf/etc/telecaster/deefuzzer_audio_safe.xml
new file mode 100644 (file)
index 0000000..d38344a
--- /dev/null
+++ b/conf/etc/telecaster/deefuzzer_audio_safe.xml
@@ -0,0 +1,61 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_safe.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1236</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+            <mode>1</mode>
+            <author>Inconnu</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>mp3</format>
+            <voices>1</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>64</bitrate>
+            <dir>/home/telecaster/media/mp3</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/mp3</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>telecaster_audio_safe</name>
+            <short_name>telecaster_audio_safe</short_name>
+            <description>TeleCaster safe audio stream</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+

diff --git a/conf/etc/telecaster/deefuzzer_video_safe.xml b/conf/etc/telecaster/deefuzzer_video_safe.xml
new file mode 100644 (file)
index 0000000..e772e52
--- /dev/null
+++ b/conf/etc/telecaster/deefuzzer_video_safe.xml
@@ -0,0 +1,61 @@
+<deefuzzer>
+    <log>/var/log/deefuzzer/telecaster_video_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_video_safe.m3u</m3u>
+
+    <station>
+        <control>
+            <mode>0</mode>
+            <port>1235</port>
+        </control>
+        <relay>
+            <url>http://127.0.0.1:9000/</url>
+            <mode>1</mode>
+            <author>TeleCaster</author>
+        </relay>
+        <media>
+            <shuffle>0</shuffle>
+            <format>webm</format>
+            <voices>1</voices>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <bitrate>64</bitrate>
+            <dir>/home/telecaster/media/webm</dir>
+        </media>
+        <twitter>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
+            <mode>0</mode>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <tags>bla bla</tags>
+        </twitter>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8080</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <record>
+            <mode>1</mode>
+            <dir>/home/telecaster/trash/webm</dir>
+        </record>
+        <jingles>
+            <shuffle>1</shuffle>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+        </jingles>
+        <infos>
+            <url>http://parisson.com.com</url>
+            <genre>Vocal</genre>
+            <name>telecaster_video_safe</name>
+            <short_name>telecaster_video_safe</short_name>
+            <description>TeleCaster safe video stream</description>
+        </infos>
+        <rss>
+            <enclosure>0</enclosure>
+            <dir>/var/www/rss</dir>
+            <media_url>http://my.domain.com/rss/</media_url>
+        </rss>
+    </station>
+
+</deefuzzer>
+
+

diff --git a/conf/home/fluxbox/tc_audio_start.sh b/conf/home/fluxbox/tc_audio_start.sh
index 54ddce18e32128e414faa0894d74daf5f6628fd2..1cd3d2d8cd103b529c74d02028d89d9c19f8ed56 100755 (executable)
--- a/conf/home/fluxbox/tc_audio_start.sh
+++ b/conf/home/fluxbox/tc_audio_start.sh
@@ -8,7 +8,7 @@ if [ ! $pid = "" ]; then
  sleep 1
 else
  jack-rack -n /etc/telecaster/eq_comp_limit_02.rack > /dev/null &
- sleep 15
+ sleep 12
  jack_connect system:capture_1 jack_rack:in_1
  jack_connect system:capture_2 jack_rack:in_2
 fi
@@ -16,6 +16,7 @@ fi
 qjackctl &
 
 edcast_jack -c /etc/telecaster/edcast_jack_local.cfg -n LIVE -p jack_rack > /dev/null &
+
 sleep 3
 
 # MONO setup
@@ -32,4 +33,4 @@ jack_connect jack_rack:out_1  system:playback_2
 #jack_connect jack_rack:out_2  system:playback_2
 
 # Start safe DeeFuzzer
-deefuzzer /etc/telecaster/deefuzzer_safe.xml > /dev/null &
+deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml > /dev/null &

diff --git a/conf/home/fluxbox/tc_video_start.sh b/conf/home/fluxbox/tc_video_start.sh
index 3a6bf9f7c68af09a90a747e21e577861ac335b5f..d29c79a8385873a93033dc78d402fdb21447a4e1 100755 (executable)
--- a/conf/home/fluxbox/tc_video_start.sh
+++ b/conf/home/fluxbox/tc_video_start.sh
@@ -2,5 +2,11 @@
 
 # Start TeleCaster video channel
 
-/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh
- 
+/home/telecaster/.fluxbox/telecaster/tc_video_simple_webm_stream.sh &
+
+sleep 3
+
+jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
+jack_connect    jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+
+deefuzzer /etc/telecaster/deefuzzer_video_safe.xml > /dev/null & 

diff --git a/conf/home/fluxbox/telecaster/tc_flu_simple_webm.sh b/conf/home/fluxbox/telecaster/tc_flu_simple_webm.sh
new file mode 100755 (executable)
index 0000000..e86ca98
--- /dev/null
+++ b/conf/home/fluxbox/telecaster/tc_flu_simple_webm.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+
+# Start TeleCaster video channel
+
+WIDTH=640
+HEIGHT=360
+#WIDTH=1024
+#HEIGHT=576
+
+
+pipe="v4l2src device=/dev/video0  \
+       ! vp8-encoder ! muxout. \
+       jackaudiosrc ! vorbis-encoder ! muxout.  \
+       webmmux streamable=true name=muxout"
+
+flumotion-launch pipeline-producer pipeline=$pipe ! http-streamer port=8800 
+
+sleep 2
+
+jack_disconnect system:capture_1 flumotion-launch:in_jackaudiosrc0_1
+jack_connect   jack_rack:out_1  flumotion-launch:in_jackaudiosrc0_1
+

diff --git a/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh b/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
index 9d31bf6545a5e2e139e09accbb80f626dec91758..9cb1afbec070d6c9aac79ee41ed2379284c6134b 100755 (executable)
--- a/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
+++ b/conf/home/fluxbox/telecaster/tc_video_simple_webm_stream.sh
@@ -15,10 +15,5 @@ gst-launch v4l2src device=/dev/video0 ! video/x-raw-yuv, width=$WIDTH, height=$H
        ! 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 \
-       > /dev/null &
-
-sleep 4
-
-jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
-jack_connect   jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+       > /dev/null