Merge branch 'master' of github.com:Parisson/telecaster-server

diff --cc src/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
index dbf746208a8834d5648fb975721ba9a2490a667c,0000000000000000000000000000000000000000..ef1f86653356e57b0b5a3a7e162c0380bf319cd8
mode 100644,000000..100644
--- 1/src/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
--- /dev/null
+++ b/src/etc/telecaster/deefuzzer/telecaster_mp3_default.xml
@@@ -1,116 -1,0 +1,116 @@@
-             <host>angus.parisson.com</host>
 +<deefuzzer>
 +    <log>/var/log/telecaster/deefuzzer_mp3_station.log</log>
 +    <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
 +
 +    <station>
 +        <infos>
 +            <short_name>telecaster_live_safe</short_name>
 +            <name>TeleCaster Localhost Live Safe Recorder</name>
 +            <description>TeleCaster safe local live audio record</description>
 +            <url>http://parisson.com</url>
 +            <genre>Vocal</genre>
 +        </infos>
 +        <server>
 +            <type>icecast</type>
 +            <host>127.0.0.1</host>
 +            <port>8000</port>
 +            <sourcepassword>source2parisson</sourcepassword>
 +            <public>0</public>
 +        </server>
 +        <media>
 +            <dir>/usr/local/share/telecaster/media/mp3</dir>
 +            <format>mp3</format>
 +            <bitrate>96</bitrate>
 +            <ogg_quality>7</ogg_quality>
 +            <samplerate>48000</samplerate>
 +            <voices>2</voices>
 +            <shuffle>1</shuffle>
 +        </media>
 +        <rss>
 +            <dir>/var/www/rss</dir>
 +            <enclosure>0</enclosure>
 +        </rss>
 +        <twitter>
 +            <mode>0</mode>
 +            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
 +            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
 +            <tags>bla bla</tags>
 +        </twitter>
 +        <jingles>
 +            <mode>0</mode>
 +            <dir>/path/to/jingles</dir>
 +            <shuffle>1</shuffle>
 +        </jingles>
 +        <control>
 +            <mode>1</mode>
 +            <port>16003</port>
 +        </control>
 +        <relay>
 +            <mode>1</mode>
 +            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
 +            <author>Parisson</author>
 +        </relay>
 +        <record>
 +            <mode>1</mode>
 +            <dir>/home/telecaster/archives</dir>
 +        </record>
 +    </station>
 +
 +    <station>
 +        <infos>
 +            <short_name>telecaster_live_safe</short_name>
 +            <name>TeleCaster Localhost Live Safe Recorder</name>
 +            <description>TeleCaster safe local live audio record</description>
 +            <url>http://parisson.com</url>
 +            <genre>Vocal</genre>
 +        </infos>
 +        <server>
 +            <type>icecast</type>
++            <host>stream.parisson.com</host>
 +            <port>8000</port>
 +            <sourcepassword>source2parisson</sourcepassword>
 +            <public>0</public>
 +        </server>
 +        <media>
 +            <dir>/home/telecaster/media/mp3</dir>
 +            <format>mp3</format>
 +            <bitrate>96</bitrate>
 +            <ogg_quality>7</ogg_quality>
 +            <samplerate>48000</samplerate>
 +            <voices>2</voices>
 +            <shuffle>1</shuffle>
 +        </media>
 +        <rss>
 +            <dir>/var/www/rss</dir>
 +            <enclosure>0</enclosure>
 +        </rss>
 +        <twitter>
 +            <mode>0</mode>
 +            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
 +            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
 +            <tags>bla bla</tags>
 +        </twitter>
 +        <jingles>
 +            <mode>0</mode>
 +            <dir>/path/to/jingles</dir>
 +            <shuffle>1</shuffle>
 +        </jingles>
 +        <control>
 +            <mode>0</mode>
 +            <port>16004</port>
 +        </control>
 +        <relay>
 +            <mode>1</mode>
 +            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
 +            <author>Parisson</author>
 +        </relay>
 +        <record>
 +            <mode>0</mode>
 +            <dir>/home/telecaster/trash</dir>
 +        </record>
 +    </station>
 +
 +
 +</deefuzzer>
 +
 +

diff --cc src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
index fc2b7c60d0397ebc3362807a7cb3d2365fdfbbbd,0000000000000000000000000000000000000000..e69dc804506e25a95002341960c93493290b1047
mode 100644,000000..100644
--- 1/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
--- /dev/null
+++ b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
@@@ -1,112 -1,0 +1,112 @@@
-             <host>angus.parisson.com</host>
 +<deefuzzer>
 +    <m3u>/var/www/m3u/telecaster_webm.m3u</m3u>
 +    <station>
 +        <control>
 +            <mode>0</mode>
 +            <port>16005</port>
 +        </control>
 +        <relay>
 +            <url>http://127.0.0.1:8080/consume/monitor</url>
 +            <mode>1</mode>
 +            <author>Parisson</author>
 +        </relay>
 +        <media>
 +            <shuffle>0</shuffle>
 +            <format>webm</format>
 +            <voices>2</voices>
 +            <ogg_quality>7</ogg_quality>
 +            <samplerate>48000</samplerate>
 +            <bitrate>600</bitrate>
 +            <dir>/usr/local/share/telecaster/media/webm</dir>
 +        </media>
 +        <twitter>
 +            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
 +            <mode>0</mode>
 +            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
 +            <tags>bla bla</tags>
 +        </twitter>
 +        <server>
++            <host>stream.parisson.com</host>
 +            <type>stream-m</type>
 +            <port>8080</port>
 +            <sourcepassword>source2parisson</sourcepassword>
 +            <public>0</public>
 +        </server>
 +        <record>
 +            <mode>0</mode>
 +            <dir>/home/telecaster/archives</dir>
 +        </record>
 +        <jingles>
 +            <shuffle>0</shuffle>
 +            <mode>0</mode>
 +            <dir>/path/to/jingles</dir>
 +        </jingles>
 +        <infos>
 +            <url>http://parisson.com</url>
 +            <genre>Oral</genre>
 +            <name>crfpa-droit-international-prive-cours</name>
 +            <short_name>crfpa-droit-international-prive-cours</short_name>
 +            <description>crfpa-droit-international-prive-cours</description>
 +        </infos>
 +        <rss>
 +            <enclosure>0</enclosure>
 +            <dir>/var/www/rss</dir>
 +        </rss>
 +    </station>
 +    <station>
 +        <control>
 +            <mode>1</mode>
 +            <port>16006</port>
 +        </control>
 +        <relay>
 +            <url>http://127.0.0.1:8080/consume/monitor</url>
 +            <mode>1</mode>
 +            <author>Parisson</author>
 +        </relay>
 +        <media>
 +            <shuffle>0</shuffle>
 +            <format>webm</format>
 +            <voices>2</voices>
 +            <ogg_quality>7</ogg_quality>
 +            <samplerate>48000</samplerate>
 +            <bitrate>600</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>
 +            <type>stream-m</type>
 +            <port>8080</port>
 +            <sourcepassword>source2parisson</sourcepassword>
 +            <public>0</public>
 +        </server>
 +        <record>
 +            <mode>1</mode>
 +            <dir>/home/telecaster/archives</dir>
 +        </record>
 +        <jingles>
 +            <shuffle>0</shuffle>
 +            <mode>0</mode>
 +            <dir>/path/to/jingles</dir>
 +        </jingles>
 +        <infos>
 +            <url>http://parisson.com</url>
 +            <genre>Oral</genre>
 +            <name>crfpa-droit-international-prive-cours</name>
 +            <short_name>crfpa-droit-international-prive-cours</short_name>
 +            <description>crfpa-droit-international-prive-cours</description>
 +        </infos>
 +        <rss>
 +            <enclosure>0</enclosure>
 +            <dir>/var/www/rss</dir>
 +        </rss>
 +    </station>
 +
 +
 +<log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
 +</deefuzzer>

diff --cc src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh
index 13f06bdadd0afe6acd546407f29dd2c5c732fcf1,0000000000000000000000000000000000000000..8a035e8291abf2b6d7b3fe472d4efff59e926c54
mode 100755,000000..100755
--- 1/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh
--- /dev/null
+++ b/src/home/telecaster/.fluxbox/scripts/tc_video_simple_webm_stream.sh
@@@ -1,26 -1,0 +1,26 @@@
-       ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \
 +#!/bin/sh
 +
 +# Start TeleCaster video channel
 +
 +#WIDTH=640
 +#HEIGHT=360
 +WIDTH=864
 +HEIGHT=480
 +#WIDTH=1280
 +#HEIGHT=720
 +
 +v4l2-ctl -d 0 -c power_line_frequency=1
 +v4l2-ctl -d 0 -c zoom_absolute=100
 +v4l2-ctl -d 0 -c focus_auto=0
 +v4l2-ctl -d 0 -c focus_absolute=1
 +
 +# ! queue ! videoflip method=rotate-180 \
 +
 +gst-launch v4l2src device=/dev/video0 ! video/x-raw-rgb, width=$WIDTH, height=$HEIGHT, framerate={30/1}  \
 +      ! queue ! ffmpegcolorspace \
 +      ! queue ! vp8enc speed=2 threads=4 quality=10.0 max-latency=25 max-keyframe-distance=30 auto-alt-ref-frames=true  ! queue ! muxout. \
 +      jackaudiosrc connect=2 ! audio/x-raw-float, channels=2 \
 +      ! queue ! audioconvert ! queue ! vorbisenc quality=0.4 ! queue ! muxout.  \
 +      webmmux streamable=true name=muxout \
++      ! queue ! tcpserversink host=127.0.0.1 port=9000 protocol=none blocksize=65536 sync-method=1 \
 +      > /dev/null