add 1 stream to deefuzzer -> 1 local + 1 distant (record on local by default)

diff --git a/conf/etc/telecaster/deefuzzer.xml b/conf/etc/telecaster/deefuzzer.xml
index b078f62f99027404919ad1daeaf2f8a1add12a70..077f197d13592b388dd183cb277e6afa6cb81f99 100644 (file)
--- a/conf/etc/telecaster/deefuzzer.xml
+++ b/conf/etc/telecaster/deefuzzer.xml
@@ -4,7 +4,61 @@
 
     <station>
         <infos>
-            <short_name>telecaster_04</short_name>
+            <short_name>telecaster_local</short_name>
+            <name>TeleCaster LocalHost</name>
+            <description>TeleCaster local audio streaming</description>
+            <url>http://crfpa.pre-barreau.com</url>
+            <genre>Vocal</genre>
+        </infos>
+        <server>
+            <host>127.0.0.1</host>
+            <port>8000</port>
+            <sourcepassword>source2parisson</sourcepassword>
+            <public>0</public>
+        </server>
+        <media>
+            <dir>/path/to/mp3</dir>
+            <format>mp3</format>
+            <bitrate>96</bitrate>
+            <ogg_quality>7</ogg_quality>
+            <samplerate>44100</samplerate>
+            <voices>2</voices>
+            <shuffle>1</shuffle>
+        </media>
+        <rss>
+            <dir>/var/www/rss</dir>
+            <enclosure>0</enclosure>
+        </rss>
+        <twitter>
+            <mode>0</mode>
+            <user>my_twitter_user</user>
+            <pass>my_twitter_password</pass>
+            <tags>bla bla</tags>
+        </twitter>
+        <jingles>
+            <mode>0</mode>
+            <dir>/path/to/jingles</dir>
+            <shuffle>1</shuffle>
+        </jingles>
+        <control>
+            <mode>1</mode>
+            <port>1234</port>
+        </control>
+        <relay>
+            <mode>1</mode>
+            <url>http://localhost:8000/telecaster_live.mp3</url>
+            <author>Parisson</author>
+        </relay>
+        <record>
+            <mode>1</mode>
+            <dir>/path/to/archives</dir>
+        </record>
+    </station>
+
+
+    <station>
+        <infos>
+            <short_name>telecaster</short_name>
             <name>TeleCaster #4</name>
             <description>TeleCaster testing</description>
             <url>http://crfpa.pre-barreau.com</url>
@@ -41,8 +95,8 @@
             <shuffle>1</shuffle>
         </jingles>
         <control>
-            <mode>1</mode>
-            <port>1234</port>
+            <mode>0</mode>
+            <port>1235</port>
         </control>
         <relay>
             <mode>1</mode>
@@ -55,6 +109,7 @@
         </record>
     </station>
 
+
 </deefuzzer>
 
 

diff --git a/station.py b/station.py
index 0b62afd0e7b874c56013f31bdcb64a0a1e671020..6bf34262586764df7a0b0bd95103a5f687596120 100644 (file)
--- a/station.py
+++ b/station.py
@@ -133,22 +133,42 @@ class Station(Conference):
             else:
                 self.jack_inputs.append(jack_inputs['name'])
 
+        # DeeFuzzzer setup
         self.deefuzzer_dict = xml2dict(self.deefuzzer_default_conf_file)
-        self.deefuzzer_dict['deefuzzer']['station']['infos']['short_name'] = self.mount_point
-        self.deefuzzer_dict['deefuzzer']['station']['infos']['name'] = self.ServerName
-        self.deefuzzer_dict['deefuzzer']['station']['infos']['description'] = self.ServerDescription.replace(' ','_')
-        self.deefuzzer_dict['deefuzzer']['station']['infos']['genre'] = self.genre
-        self.deefuzzer_dict['deefuzzer']['station']['server']['host'] = self.host
-        self.deefuzzer_dict['deefuzzer']['station']['server']['port'] = self.port
-        self.deefuzzer_dict['deefuzzer']['station']['server']['sourcepassword'] = self.password
-        self.deefuzzer_dict['deefuzzer']['station']['media']['bitrate'] = self.bitrate
-        self.deefuzzer_dict['deefuzzer']['station']['media']['dir'] = self.play_dir
-        self.deefuzzer_dict['deefuzzer']['station']['media']['voices'] = str(len(self.jack_inputs))
-        self.deefuzzer_dict['deefuzzer']['station']['record']['mode'] = '1'
-        self.deefuzzer_dict['deefuzzer']['station']['record']['dir'] = self.file_dir
-        self.deefuzzer_dict['deefuzzer']['station']['relay']['mode'] = '1'
-        self.deefuzzer_dict['deefuzzer']['station']['relay']['author'] = self.professor
-        self.deefuzzer_port = self.deefuzzer_dict['deefuzzer']['station']['control']['port']
+        self.station_local = self.deefuzzer_dict['deefuzzer']['station'][0]
+        self.station_distant = self.deefuzzer_dict['deefuzzer']['station'][1]
+
+        self.station_local['infos']['short_name'] = self.mount_point
+        self.station_local['infos']['name'] = self.ServerName
+        self.station_local['infos']['description'] = self.ServerDescription.replace(' ','_')
+        self.station_local['infos']['genre'] = self.genre
+        self.station_local['server']['host'] = '127.0.0.1'
+        self.station_local['server']['port'] = self.port
+        self.station_local['server']['sourcepassword'] = self.password
+        self.station_local['media']['bitrate'] = self.bitrate
+        self.station_local['media']['dir'] = self.play_dir
+        self.station_local['media']['voices'] = str(len(self.jack_inputs))
+        self.station_local['record']['mode'] = '1'
+        self.station_local['record']['dir'] = self.file_dir
+        self.station_local['relay']['mode'] = '1'
+        self.station_local['relay']['author'] = self.professor
+
+        self.station_distant['infos']['short_name'] = self.mount_point
+        self.station_distant['infos']['name'] = self.ServerName
+        self.station_distant['infos']['description'] = self.ServerDescription.replace(' ','_')
+        self.station_distant['infos']['genre'] = self.genre
+        self.station_distant['server']['host'] = self.host
+        self.station_distant['server']['port'] = self.port
+        self.station_distant['server']['sourcepassword'] = self.password
+        self.station_distant['media']['bitrate'] = self.bitrate
+        self.station_distant['media']['dir'] = self.play_dir
+        self.station_distant['media']['voices'] = str(len(self.jack_inputs))
+        self.station_distant['record']['mode'] = '0'
+        self.station_distant['record']['dir'] = self.file_dir
+        self.station_distant['relay']['mode'] = '1'
+        self.station_distant['relay']['author'] = self.professor
+
+        self.deefuzzer_local_port = self.station_local['control']['port']
         self.deefuzzer_xml = dicttoxml(self.deefuzzer_dict)
 
     def write_deefuzzer_conf(self):
@@ -176,7 +196,7 @@ class Station(Conference):
 
     def stop_rec(self):
         if len(self.deefuzzer_pid) != 0:
-            target = liblo.Address(self.deefuzzer_port)
+            target = liblo.Address(self.deefuzzer_local_port)
             liblo.send(target, "/record", 0)
 
     def mp3_convert(self):