remove bad metadata delimiters (bug with libshout), update metadata for pre-barreau

diff --git a/conf/etc/telecaster/edcast_jack_local.cfg b/conf/etc/telecaster/edcast_jack_local.cfg
new file mode 100644 (file)
index 0000000..dc66cc7
--- /dev/null
+++ b/conf/etc/telecaster/edcast_jack_local.cfg
@@ -0,0 +1,53 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/telecaster_live.mp3
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+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)
+Encode=MP3
+# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
+NumberChannels=1
+Samplerate=48000
+BitrateNominal=64
+BitrateMin=32
+BitrateMax=96
+
+#
+SaveDirectoryFlag=1
+SaveDirectory=/home/pre-barreau/trash
+SaveAsWAV=0
+#
+# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
+OggQuality=3
+OggBitrateQualityFlag=Quality
+# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
+LameCBRFlag=0
+LameQuality=5
+LameCopywrite=0
+LameOriginal=0
+LameStrictISO=0
+LameDisableReservior=0
+LameVBRMode=vbr_abr
+LameLowpassfreq=0
+LameHighpassfreq=0
+LAMEPreset=0
+# AAC (FAAC) specific settings.
+AACQuality=100
+AACCutoff=
+# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
+LogLevel=1
+# Log File
+LogFile=/tmp/streamTranscoder_1
+

diff --git a/conf/etc/telecaster/telecaster_edcast_mp3.cfg b/conf/etc/telecaster/telecaster_edcast_mp3.cfg
deleted file mode 100644 (file)
index e31f2a2..0000000
--- a/conf/etc/telecaster/telecaster_edcast_mp3.cfg
+++ /dev/null
@@ -1,53 +0,0 @@
-# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
-ServerType=Icecast2
-Server=localhost
-Port=8000
-ServerPassword=source2parisson
-ServerMountpoint=/telecaster_live.mp3
-# YP (Stream Directory) Settings
-ServerPublic=0
-ServerIRC=
-ServerAIM=
-ServerICQ=
-ServerStreamURL=http://stream.parisson.com
-ServerName=This is my server name
-ServerDescription=This is my server description
-ServerGenre=Teaching
-AutomaticReconnectSecs=10
-AutoConnect=1
-# Output codec selection (Valid selections : MP3, OggVorbis, Ogg FLAC, AAC, AAC Plus)
-Encode=MP3
-# General settings (non-codec related).  Note : NumberChannels = 1 for MONO, 2 for STEREO
-NumberChannels=1
-Samplerate=48000
-BitrateNominal=64
-BitrateMin=32
-BitrateMax=128
-
-#
-SaveDirectoryFlag=1
-SaveDirectory=/home/pre-barreau/backup
-SaveAsWAV=0
-#
-# Ogg Vorbis specific settings.  Note: Valid settings for BitrateQuality flag are (Quality, Bitrate Management)
-OggQuality=3
-OggBitrateQualityFlag=Quality
-# LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=0
-LameQuality=5
-LameCopywrite=0
-LameOriginal=0
-LameStrictISO=0
-LameDisableReservior=0
-LameVBRMode=vbr_abr
-LameLowpassfreq=0
-LameHighpassfreq=0
-LAMEPreset=0
-# AAC (FAAC) specific settings.
-AACQuality=100
-AACCutoff=
-# Log Level 1 = LOG_ERROR, 2 = LOG_ERROR+LOG_WARNING, 3 = LOG_ERROR+LOG_WARNING+LOG_DEBUG
-LogLevel=1
-# Log File
-LogFile=/tmp/streamTranscoder_1
-

diff --git a/station.py b/station.py
index ef0fbf422f1ab8a8b41f67a44fe97ed4ee008792..7a66637e447972ca16c91052f75e9ba62009dd65 100644 (file)
--- 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'