From 5d524f3d916617e5cb813f83346080633e8f14bd Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Fri, 25 Jul 2008 17:31:22 +0000
Subject: [PATCH]
---
etc/pre-barreau_conferences.xml | 39 +++++++++++++++++++++++----------
etc/telecaster_mp3.cfg | 6 ++---
telecaster.py | 1 +
3 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index 3753025..1043f21 100644
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -261,17 +261,34 @@
3e_cours
4e_cours
5e_cours
- 6e_cours
- 7e_cours
- 8e_cours
- 9e_cours
- 10e_cours
- 11e_cours
- 12e_cours
- 13e_cours
- 14e_cours
- 15e_cours
- 16e_cours
+ 6e_cours
+ 7e_cours
+ 8e_cours
+ 9e_cours
+ 10e_cours
+ 11e_cours
+ 12e_cours
+ 13e_cours
+ 14e_cours
+ 15e_cours
+ 16e_cours
+
+ 1ere_corrections
+ 2e_corrections
+ 3e_corrections
+ 4e_corrections
+ 5e_corrections
+ 6e_corrections
+ 7e_corrections
+ 8e_corrections
+ 9e_corrections
+ 10e_corrections
+ 11e_corrections
+ 12e_corrections
+ 13e_corrections
+ 14e_corrections
+ 15e_corrections
+ 16e_corrections
diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
index f065c94..d5a4fa4 100644
--- 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 42ca194..9cc482e 100755
--- 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']
--
2.39.5