From 427690e8e0eb52b29529d9bb5b4be27d0bab9d7b Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Wed, 28 Nov 2007 14:35:21 +0000
Subject: [PATCH] Reorganize

---
 etc/teleoddcast.cfg |  6 +++---
 etc/teleoddcast.xml | 10 +++++-----
 teleoddcast.py      |  6 +++---
 3 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/etc/teleoddcast.cfg b/etc/teleoddcast.cfg
index 80b2e8b..cc30eb8 100644
--- a/etc/teleoddcast.cfg
+++ b/etc/teleoddcast.cfg
@@ -1,7 +1,7 @@
 Server=localhost
 Port=8000
 ServerPassword=source2parisson
-ServerMountpoint=/My_best_funky_station_-_AE_-_Commercial_Correctio.ogg
+ServerMountpoint=/My_station_-_AE_-_REUNION.ogg
 ServerPublic=0
 AutomaticReconnectSecs=10
 Encode=OggVorbis
@@ -13,8 +13,8 @@ ServerType=Icecast2
 ExternalFile=/home/pre-barreau/augustins/audio/
 #YP Settings
 ServerStreamURL=http://www.pre-barreau.com
-ServerName=My_best_funky_station_-_AE_-_Commercial_Correctio_-_1
-ServerDescription=My_best_funky_station_-_AE_-_Commercial_Correctio_-_1_-_zad_-_azdzaddza
+ServerName=My_station_-_AE_-_REUNION_-_1
+ServerDescription=My_station_-_AE_-_REUNION_-_1_-_azd_-_azd
 ServerGenre=Teaching
 #Advanced Settings
 LogLevel=1
diff --git a/etc/teleoddcast.xml b/etc/teleoddcast.xml
index 5f563c9..b054974 100644
--- a/etc/teleoddcast.xml
+++ b/etc/teleoddcast.xml
@@ -1,8 +1,8 @@
 <teleoddcast>
        <infos>
-            <short_name>My_Station_5</short_name>
-            <name>My best funky station</name>
-            <description>My personal best funky playlist ever !</description>
+            <short_name>My_Station</short_name>
+            <name>My station</name>
+            <description>A station where you can listen to me</description>
             <url>http://mydomain.com</url>
             <genre>Other</genre>
             <channels>1</channels>
@@ -13,8 +13,8 @@
             <sourcepassword>source2parisson</sourcepassword>
             <public>1</public>
             <root_dir>/var/www/cgi-bin/teleoddcast/</root_dir>
-            <odd_conf_file>teleoddcast.cfg</odd_conf_file>
-            <lock_file>teleoddcast.lock</lock_file>
+            <odd_conf_file>etc/teleoddcast.cfg</odd_conf_file>
+            <lock_file>lock/teleoddcast.lock</lock_file>
         </server>
         <media>
             <dir>/tmp/media</dir>
diff --git a/teleoddcast.py b/teleoddcast.py
index 06fc316..a406dfc 100755
--- a/teleoddcast.py
+++ b/teleoddcast.py
@@ -188,7 +188,7 @@ class WebView:
         print "<HTML>"
         print "<HEAD>"
         print "\t<TITLE>"+self.title+"</TITLE>"
-        print "<link href=\"teleoddcast.css\" rel=\"stylesheet\" type=\"text/css\">"
+        print "<link href=\"css/teleoddcast.css\" rel=\"stylesheet\" type=\"text/css\">"
         print '<script language="Javascript" type="text/javascript" >'
         print 'function choix(formulaire)'
         print '{var j; var i = formulaire.department.selectedIndex;'
@@ -361,8 +361,8 @@ class TeleOddCast:
 
 
 # Call main function.
-conf_file = 'teleoddcast.xml'
-school_file = 'pre-barreau.xml'
+conf_file = 'etc/teleoddcast.xml'
+school_file = 'etc/pre-barreau.xml'
 
 if __name__ == '__main__':
     t = TeleOddCast(conf_file, school_file)
-- 
2.39.5

