From 1422a0db38b063a905e9b5b4f7c799f4191a7c7c Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Fri, 13 Jul 2012 01:02:03 +0200
Subject: [PATCH] update confs

---
 .../conf/etc/telecaster/deefuzzer_mp3.xml     | 42 ++++++++++---------
 .../conf/etc/telecaster/edcast_jack_local.cfg |  2 +-
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml b/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml
index 8e2be66..264ef2e 100644
--- a/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml
+++ b/tcserver/conf/etc/telecaster/deefuzzer_mp3.xml
@@ -1,27 +1,28 @@
 <deefuzzer>
-    <log>/var/log/deefuzzer/telecaster.log</log>
-    <m3u>/var/www/m3u/telecaster.m3u</m3u>
+    <log>/var/log/telecaster/deefuzzer_mp3_safe.log</log>
+    <m3u>/var/www/m3u/telecaster_mp3.m3u</m3u>
 
     <station>
         <infos>
-            <short_name>telecaster_local</short_name>
-            <name>TeleCaster Localhost</name>
-            <description>TeleCaster local audio streaming</description>
+            <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>/path/to/mp3</dir>
+            <dir>/home/telecaster/media/mp3</dir>
             <format>mp3</format>
             <bitrate>96</bitrate>
             <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
+            <samplerate>48000</samplerate>
             <voices>2</voices>
             <shuffle>1</shuffle>
         </media>
@@ -51,31 +52,31 @@
         </relay>
         <record>
             <mode>1</mode>
-            <dir>/path/to/archives</dir>
+            <dir>/home/telecaster/archives</dir>
         </record>
     </station>
 
-
     <station>
         <infos>
-            <short_name>telecaster</short_name>
-            <name>TeleCaster Remote</name>
-            <description>TeleCaster Remote</description>
+            <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>School</genre>
+            <genre>Vocal</genre>
         </infos>
         <server>
-            <host>stream.parisson.com</host>
+            <type>icecast</type>
+            <host>angus.parisson.com</host>
             <port>8000</port>
             <sourcepassword>source2parisson</sourcepassword>
             <public>0</public>
         </server>
         <media>
-            <dir>/path/to/mp3</dir>
+            <dir>/home/telecaster/media/mp3</dir>
             <format>mp3</format>
             <bitrate>96</bitrate>
             <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
+            <samplerate>48000</samplerate>
             <voices>2</voices>
             <shuffle>1</shuffle>
         </media>
@@ -85,8 +86,8 @@
         </rss>
         <twitter>
             <mode>0</mode>
-            <key>my_twitter_user</key>
-            <secret>my_twitter_password</secret>
+            <key>76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE</key>
+            <secret>4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4</secret>
             <tags>bla bla</tags>
         </twitter>
         <jingles>
@@ -95,7 +96,7 @@
             <shuffle>1</shuffle>
         </jingles>
         <control>
-            <mode>0</mode>
+            <mode>1</mode>
             <port>1235</port>
         </control>
         <relay>
@@ -105,10 +106,11 @@
         </relay>
         <record>
             <mode>0</mode>
-            <dir>/path/to/archives</dir>
+            <dir>/home/telecaster/trash</dir>
         </record>
     </station>
 
+
 </deefuzzer>
 
 
diff --git a/tcserver/conf/etc/telecaster/edcast_jack_local.cfg b/tcserver/conf/etc/telecaster/edcast_jack_local.cfg
index 16db86a..ab95db6 100644
--- a/tcserver/conf/etc/telecaster/edcast_jack_local.cfg
+++ b/tcserver/conf/etc/telecaster/edcast_jack_local.cfg
@@ -49,5 +49,5 @@ AACCutoff=
 # Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
 LogLevel=1
 # Log File
-LogFile=/tmp/telecaster_streamer_log
+LogFile=/var/log/telecaster/mp3_safe.log
 
-- 
2.39.5