fix bitrate config

diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
index 633ffee381ce48b37dbdfc4d328ebcef50bcc184..ad02c6ab9846e90a79035236a96e81845c15f004 100644 (file)
--- a/etc/telecaster_mp3.cfg
+++ b/etc/telecaster_mp3.cfg
@@ -5,8 +5,8 @@ ServerMountpoint=/Pre-Barreau_-_ICP_-_AE_-_Adm_Correction.mp3
 ServerPublic=0
 AutomaticReconnectSecs=10
 Encode=MP3 Lame
-BitrateNominal=64
-OggQuality=1
+BitrateNominal=96
+OggQuality=3
 NumberChannels=1
 Samplerate=44100
 ServerType=Icecast2

diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index c8999549ea9b66b76cb915841c25f1cdb33956b7..b2b171644f9bcd9a20b6f3db4c232b3cbec486c1 100644 (file)
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -22,10 +22,10 @@
         <dir>/home/prebarreau/media</dir>
         <raw_dir>/home/prebarreau/backup</raw_dir>
         <format>mp3</format>
-        <bitrate>64</bitrate>
-        <ogg_quality>2</ogg_quality>
+        <bitrate>96</bitrate>
+        <ogg_quality>3</ogg_quality>
         <samplerate>44100</samplerate>
-        <voices>2</voices>
+        <voices>1</voices>
         <shuffle>1</shuffle>
     </media>
 </telecaster>

diff --git a/station.py b/station.py
index 94d1160cf8e246fc75496a38ef9b465642adcdf2..81d1e81434b3f43ff6d853aa511fa931826f7ec0 100644 (file)
--- a/station.py
+++ b/station.py
@@ -67,7 +67,7 @@ class Station(Conference):
         self.password = self.conf['server']['sourcepassword']
         self.url = 'http://'+self.host+':'+self.port
         self.odd_conf_file = self.conf['server']['odd_conf_file']
-        self.bitrate = '64'
+        self.bitrate = self.conf['media']['bitrate']
         self.format = self.conf['media']['format']
         self.description = [self.title, self.department, self.conference, self.session, self.professor, self.comment]
         self.server_name = [self.title, self.department, self.conference]