fix player and rec dir

diff --git a/conf/etc/telecaster/telecaster.xml b/conf/etc/telecaster/telecaster.xml
index ee15fad8153cf5c660faf17280fb86b233e4829c..d6846feb12e2a1191453d1522c7722a0e09a1d7d 100644 (file)
--- a/conf/etc/telecaster/telecaster.xml
+++ b/conf/etc/telecaster/telecaster.xml
@@ -19,6 +19,7 @@
     </server>
     <media>
         <record>true</record>
+        <play_dir>/home/momo/mymusic/telecaster/media</play_dir>
         <rec_dir>/home/momo/mymusic/telecaster/backup</rec_dir>
         <format>mp3</format>
         <bitrate>256</bitrate>

diff --git a/station.py b/station.py
index f197f636f58a17bcb1285be49f54a3e98cc17615..ef0fbf422f1ab8a8b41f67a44fe97ed4ee008792 100644 (file)
--- a/station.py
+++ b/station.py
@@ -98,6 +98,7 @@ class Station(Conference):
         self.dict['Bitrate'] = str(self.bitrate) + ' kbps'
         self.record = str_to_bool(self.conf['media']['record'])
         self.rec_dir = self.conf['media']['rec_dir']
+        self.play_dir = self.conf['media']['play_dir']
         self.ogg_quality = self.conf['media']['ogg_quality']
         self.format = self.conf['media']['format']
         self.channels = int(self.conf['media']['channels'])
@@ -141,9 +142,9 @@ class Station(Conference):
         deefuzzer_dict['deefuzzer']['station']['server']['port'] = self.port
         deefuzzer_dict['deefuzzer']['station']['server']['sourcepassword'] = self.password
         deefuzzer_dict['deefuzzer']['station']['media']['bitrate'] = self.bitrate
-        deefuzzer_dict['deefuzzer']['station']['media']['dir'] = self.rec_dir
+        deefuzzer_dict['deefuzzer']['station']['media']['dir'] = self.play_dir
         deefuzzer_dict['deefuzzer']['station']['media']['voices'] = str(len(self.jack_inputs))
-        deefuzzer_dict['deefuzzer']['station']['record']['mode'] = '0'
+        deefuzzer_dict['deefuzzer']['station']['record']['mode'] = '1'
         deefuzzer_dict['deefuzzer']['station']['record']['dir'] = self.rec_dir
         deefuzzer_dict['deefuzzer']['station']['relay']['mode'] = '1'