(no commit message)

diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index 3753025c9bd2f35cb96194ee12918be5836225c9..1043f21eed60833e8bcf45345c5bfa3569399eb6 100644 (file)
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -261,17 +261,34 @@
         <comment><text>3e_cours</text></comment>
         <comment><text>4e_cours</text></comment>
         <comment><text>5e_cours</text></comment>
-            <comment><text>6e_cours</text></comment>
-            <comment><text>7e_cours</text></comment>
-            <comment><text>8e_cours</text></comment>
-            <comment><text>9e_cours</text></comment>
-            <comment><text>10e_cours</text></comment>
-            <comment><text>11e_cours</text></comment>
-            <comment><text>12e_cours</text></comment>
-            <comment><text>13e_cours</text></comment>
-            <comment><text>14e_cours</text></comment>
-            <comment><text>15e_cours</text></comment>
-            <comment><text>16e_cours</text></comment>
+        <comment><text>6e_cours</text></comment>
+        <comment><text>7e_cours</text></comment>
+        <comment><text>8e_cours</text></comment>
+        <comment><text>9e_cours</text></comment>
+        <comment><text>10e_cours</text></comment>
+        <comment><text>11e_cours</text></comment>
+        <comment><text>12e_cours</text></comment>
+        <comment><text>13e_cours</text></comment>
+        <comment><text>14e_cours</text></comment>
+        <comment><text>15e_cours</text></comment>
+        <comment><text>16e_cours</text></comment>
+       
+        <comment><text>1ere_corrections</text></comment>
+        <comment><text>2e_corrections</text></comment>
+        <comment><text>3e_corrections</text></comment>
+        <comment><text>4e_corrections</text></comment>
+        <comment><text>5e_corrections</text></comment>
+        <comment><text>6e_corrections</text></comment>
+        <comment><text>7e_corrections</text></comment>
+        <comment><text>8e_corrections</text></comment>
+        <comment><text>9e_corrections</text></comment>
+        <comment><text>10e_corrections</text></comment>
+        <comment><text>11e_corrections</text></comment>
+        <comment><text>12e_corrections</text></comment>
+        <comment><text>13e_corrections</text></comment>
+        <comment><text>14e_corrections</text></comment>
+        <comment><text>15e_corrections</text></comment>
+        <comment><text>16e_corrections</text></comment>
         
 </telecaster>
 

diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
index f065c94a2fed71a3043fbd84b1e3767907e3e9a0..d5a4fa49bdbbdf16796365ba07b61e2601cf5311 100644 (file)
--- a/etc/telecaster_mp3.cfg
+++ b/etc/telecaster_mp3.cfg
@@ -1,7 +1,7 @@
 Server=localhost
 Port=8000
 ServerPassword=source2parisson
-ServerMountpoint=/Pre-Barreau_-_ICP_-_FJP_-_TEST.mp3
+ServerMountpoint=/Pre-Barreau_-_ICP_-_CRFPA_-_TEST.mp3
 ServerPublic=0
 AutomaticReconnectSecs=10
 Encode=MP3 Lame
@@ -13,8 +13,8 @@ ServerType=Icecast2
 ExternalFile=/tmp/test
 #YP Settings
 ServerStreamURL=http://www.pre-barreau.com
-ServerName=Pre-Barreau_-_ICP_-_FJP_-_TEST
-ServerDescription=Pre-Barreau_-_ICP_-_FJP_-_TEST_-_1_-_GIUSTINIANI_G._-_1er_cours
+ServerName=Pre-Barreau_-_ICP_-_CRFPA_-_TEST
+ServerDescription=Pre-Barreau_-_ICP_-_CRFPA_-_TEST_-_1_-_GIUSTINIANI_G._-_2e_corrections
 ServerGenre=Teaching
 #Advanced Settings
 LogLevel=1

diff --git a/telecaster.py b/telecaster.py
index 42ca1947b0421418413fbab121f4ce902f3e2eed..9cc482ee221b448600f6b2e499d795c8021bc49a 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -61,6 +61,7 @@ class Station(Conference):
         self.date = datetime.datetime.now().strftime("%Y")
         self.time = datetime.datetime.now().strftime("%x-%X")
         self.time = self.time.replace('/','_')
+       self.time = self.time.replace(':','_')
         self.conf = xml2dict(conf_file)
         self.conf = self.conf['telecaster']
         self.root_dir = self.conf['server']['root_dir']