From d0dc8434493b8b27036d3f112fc89de68bc1f1da Mon Sep 17 00:00:00 2001
From: yomguy <>
Date: Thu, 8 Jul 2010 14:33:27 +0000
Subject: [PATCH] remove bad metadata delimiters (bug with libshout), update
 metadata for pre-barreau

---
 ...caster_edcast_mp3.cfg => edcast_jack_local.cfg} | 12 ++++++------
 station.py                                         | 14 +++++++-------
 2 files changed, 13 insertions(+), 13 deletions(-)
 rename conf/etc/telecaster/{telecaster_edcast_mp3.cfg => edcast_jack_local.cfg} (86%)

diff --git a/conf/etc/telecaster/telecaster_edcast_mp3.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
similarity index 86%
rename from conf/etc/telecaster/telecaster_edcast_mp3.cfg
rename to conf/etc/telecaster/edcast_jack_local.cfg
index e31f2a2..dc66cc7 100644
--- a/conf/etc/telecaster/telecaster_edcast_mp3.cfg
+++ b/conf/etc/telecaster/edcast_jack_local.cfg
@@ -9,10 +9,10 @@ ServerPublic=0
 ServerIRC=
 ServerAIM=
 ServerICQ=
-ServerStreamURL=http://stream.parisson.com
-ServerName=This is my server name
-ServerDescription=This is my server description
-ServerGenre=Teaching
+ServerStreamURL=http://pre-barreau.com
+ServerName=TeleCaster LIVE
+ServerDescription=Local LIVE media streaming broadcast
+ServerGenre=Vocal
 AutomaticReconnectSecs=10
 AutoConnect=1
 # Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
@@ -22,11 +22,11 @@ NumberChannels=1
 Samplerate=48000
 BitrateNominal=64
 BitrateMin=32
-BitrateMax=128
+BitrateMax=96
 
 #
 SaveDirectoryFlag=1
-SaveDirectory=/home/pre-barreau/backup
+SaveDirectory=/home/pre-barreau/trash
 SaveAsWAV=0
 #
 # Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
diff --git a/station.py b/station.py
index ef0fbf4..7a66637 100644
--- a/station.py
+++ b/station.py
@@ -104,19 +104,19 @@ class Station(Conference):
         self.channels = int(self.conf['media']['channels'])
         self.description = [self.title, self.department, self.conference, self.session, self.professor, self.comment]
         self.server_name = [self.title, self.department, self.conference]
-        self.ServerDescription = clean_string('_-_'.join(self.description))
-        self.ServerName = clean_string('_-_'.join(self.server_name))
-        self.mount_point = clean_string(self.title) + '_-_' + \
-                                 clean_string(self.department) + '_-_' + \
+        self.ServerDescription = clean_string('-'.join(self.description))
+        self.ServerName = clean_string('-'.join(self.server_name))
+        self.mount_point = clean_string(self.title) + '-' + \
+                                 clean_string(self.department) + '-' + \
                                  clean_string(self.conference)
-        self.filename = clean_string('_-_'.join(self.description[1:])) + '_-_' + self.time_txt + '.' + self.format
+        self.filename = clean_string('-'.join(self.description[1:])) + '-' + self.time_txt + '.' + self.format
         self.output_dir = self.rec_dir + os.sep + self.department + os.sep + self.date
         self.file_dir = self.output_dir + os.sep + self.ServerName
         self.uid = os.getuid()
         self.odd_pid = get_pid('^edcast_jack', self.uid)
         self.deefuzzer_pid = get_pid('/usr/bin/deefuzzer', self.uid)
-        self.new_title = clean_string('_-_'.join(self.server_name)+'_-_'+self.session+'_-_'+self.professor+'_-_'+self.comment)
-        self.short_title = clean_string('_-_'.join(self.conference)+'_-_'+self.session+'_-_'+self.professor+'_-_'+self.comment)
+        self.new_title = clean_string('-'.join(self.server_name)+'-'+self.session+'-'+self.professor+'-'+self.comment)
+        self.short_title = clean_string('-'.join(self.conference)+'-'+self.session+'-'+self.professor+'-'+self.comment)
         self.genre = 'Vocal'
         self.encoder = 'TeleCaster by Parisson'
 
-- 
2.39.5