fix webm thru icecast

diff --git a/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
index cba9b85689a019454a026bd744a56291ef20aa84..dd7266b2c7e3544abcd04a176d3f7c5b095da610 100644 (file)
--- a/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
+++ b/src/etc/telecaster/deefuzzer/telecaster_webm_default.xml
@@ -1,112 +1,116 @@
 <deefuzzer>
-    <m3u>/var/www/m3u/telecaster_webm.m3u</m3u>
+    <log>/var/log/telecaster/deefuzzer_mp3_station.log</log>
+    <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
+
     <station>
-        <control>
-            <mode>1</mode>
-            <port>16005</port>
-        </control>
-        <relay>
-            <url>http://127.0.0.1:8000/telecaster_live.webm</url>
-            <mode>1</mode>
-            <author>Parisson</author>
-        </relay>
+        <infos>
+            <short_name>telecaster_live_safe</short_name>
+            <name>TeleCaster Localhost Live Safe Recorder</name>
+            <description>TeleCaster safe local live video 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>
-            <shuffle>0</shuffle>
+            <dir>/usr/local/share/telecaster/media/webm</dir>
             <format>webm</format>
-            <voices>2</voices>
+            <bitrate>1000</bitrate>
             <ogg_quality>7</ogg_quality>
             <samplerate>48000</samplerate>
-            <bitrate>600</bitrate>
-            <dir>/usr/local/share/telecaster/media/webm</dir>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
         </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
         <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
             <mode>0</mode>
             <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
             <tags>bla bla</tags>
         </twitter>
-        <server>
-            <host>stream7.parisson.com</host>
-            <type>icecast</type>
-            <port>8000</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>
+            <shuffle>1</shuffle>
         </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>
+            <mode>0</mode>
+            <port>16013</port>
         </control>
         <relay>
-            <url>http://127.0.0.1:8000/telecaster_live.webm</url>
             <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.webm</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>stream7.parisson.com</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
         <media>
-            <shuffle>0</shuffle>
+            <dir>/usr/local/share/telecaster/media/webm</dir>
             <format>webm</format>
-            <voices>2</voices>
+            <bitrate>1000</bitrate>
             <ogg_quality>7</ogg_quality>
             <samplerate>48000</samplerate>
-            <bitrate>600</bitrate>
-            <dir>/home/telecaster/media/webm/</dir>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
         </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
         <twitter>
-            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
             <mode>0</mode>
             <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
             <tags>bla bla</tags>
         </twitter>
-        <server>
-            <host>127.0.0.1</host>
-            <type>icecast</type>
-            <port>8000</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>
+            <shuffle>1</shuffle>
         </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>
+        <control>
+            <mode>0</mode>
+            <port>16014</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.webm</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>0</mode>
+            <dir>/home/telecaster/trash</dir>
+        </record>
     </station>
 
 
-<log>/var/log/telecaster/deefuzzer_webm_safe.log</log>
 </deefuzzer>
+
+