From 8311204de1d243193fff79d9f49081a288fc765a Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 8 Jul 2010 22:39:00 +0000
Subject: [PATCH] fix output dir

---
 conf/etc/telecaster/deefuzzer.xml  | 3 ++-
 conf/etc/telecaster/telecaster.xml | 4 ++--
 station.py                         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/conf/etc/telecaster/deefuzzer.xml b/conf/etc/telecaster/deefuzzer.xml
index db1b3ba..b078f62 100644
--- a/conf/etc/telecaster/deefuzzer.xml
+++ b/conf/etc/telecaster/deefuzzer.xml
@@ -17,7 +17,7 @@
             <public>0</public>
         </server>
         <media>
-            <dir>/home/prebarreau/media/CRFPA/2009/</dir>
+            <dir>/path/to/mp3</dir>
             <format>mp3</format>
             <bitrate>96</bitrate>
             <ogg_quality>7</ogg_quality>
@@ -47,6 +47,7 @@
         <relay>
             <mode>1</mode>
             <url>http://localhost:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
         </relay>
         <record>
             <mode>0</mode>
diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index 253fba8..2bcd696 100644
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -18,8 +18,8 @@
     </server>
     <media>
         <record>true</record>
-        <play_dir>/home/pre-barreau/media/CRFPA</play_dir>
-        <rec_dir>/home/pre-barreau/backup</rec_dir>
+        <play_dir>/home/prebarreau/media</play_dir>
+        <rec_dir>/home/prebarreau/archives</rec_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
         <channels>1</channels>
diff --git a/station.py b/station.py
index adcd3df..7f6331a 100644
--- a/station.py
+++ b/station.py
@@ -111,7 +111,7 @@ class Station(Conference):
                                  clean_string(self.department) + '-' + \
                                  clean_string(self.conference)
         self.filename = clean_string('-'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
-        self.output_dir = self.rec_dir + os.sep + self.department + os.sep + self.date
+        self.output_dir = self.rec_dir + os.sep + self.date + os.sep + self.department 
         self.file_dir = self.output_dir + os.sep + self.ServerName
         self.uid = os.getuid()
         self.odd_pid = get_pid('^edcast_jack', self.uid)
-- 
2.39.5