From: yomguy <yomguy@parisson.com>
Date: Sun, 7 Feb 2010 22:22:20 +0000 (+0000)
Subject: WARNING : build now against edcast_jack 3.1.7
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=58395777dad36aab260af720eb17f6cd1a692218;p=telecaster-cgi.git

WARNING : build now against edcast_jack 3.1.7
---

diff --git a/etc/telecaster_edcast_mp3.cfg b/etc/telecaster_edcast_mp3.cfg
new file mode 100644
index 0000000..53b4a18
--- /dev/null
+++ b/etc/telecaster_edcast_mp3.cfg
@@ -0,0 +1,46 @@
+# Destination server details (to where you are encoding).  Valid server types : Shoutcast, Icecast, Icecast2
+ServerType=Icecast2
+Server=localhost
+Port=8000
+ServerPassword=source2parisson
+ServerMountpoint=/stream.mp3
+# YP (Stream Directory) Settings
+ServerPublic=0
+ServerIRC=
+ServerAIM=
+ServerICQ=
+ServerStreamURL=http://www.pre-barreau.com
+ServerName=This is my server name
+ServerDescription=This is my server description
+ServerGenre=Teaching
+AutomaticReconnectSecs=10
+AutoConnect=0
+# 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
+BitrateNominal=64
+BitrateMin=32
+BitrateMax=128
+NumberChannels=2
+Samplerate=44100
+# 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=1
+LameQuality=1
+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=3
+# Log File
+LogFile=/tmp/streamTranscoder_1.log
diff --git a/etc/telecaster_mp3.cfg b/etc/telecaster_mp3.cfg
index 83a88d9..c5906f4 100644
--- a/etc/telecaster_mp3.cfg
+++ b/etc/telecaster_mp3.cfg
@@ -8,7 +8,7 @@ Encode=MP3 Lame
 BitrateNominal=64
 OggQuality=3
 NumberChannels=2
-Samplerate=48000
+Samplerate=44100
 ServerType=Icecast2
 ExternalFile=/tmp/test
 #YP Settings
diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index 087bf0d..4a9fe16 100644
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -12,7 +12,7 @@
         <sourcepassword>source2parisson</sourcepassword>
         <public>0</public>
         <root_dir>/var/www/telecaster/</root_dir>
-        <odd_conf_file>etc/telecaster_mp3.cfg</odd_conf_file>
+        <odd_conf_file>etc/telecaster_edcast_mp3.cfg</odd_conf_file>
         <lock_file>lock/telecaster.lock</lock_file>
         <rsync_host>localhost/tmp/</rsync_host>
         <rss>
diff --git a/station.py b/station.py
index 1fdd690..941b769 100644
--- a/station.py
+++ b/station.py
@@ -89,7 +89,7 @@ class Station(Conference):
         self.output_dir = self.media_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('^oddcastv3\ -n', self.uid)
+        self.odd_pid = get_pid('^edcast_jack\ -n', self.uid)
         self.rip_pid = get_pid('streamripper ' + self.url_int + self.mount_point, 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)
@@ -152,7 +152,7 @@ class Station(Conference):
                 if 'system' in jack_input and 'capture' in jack_input.split(':')[1] :
                     self.jack_inputs.append(jack_input)
         jack_ports = ' '.join(self.jack_inputs)
-        command = 'oddcastv3 -n "'+clean_string(self.conference)[0:16]+'" -c "'+self.odd_conf+ \
+        command = 'edcast_jack -n "'+clean_string(self.conference)[0:16]+'" -c "'+self.odd_conf+ \
                   '" '+ jack_ports + ' > /dev/null &'
         os.system(command)
         self.set_lock()
diff --git a/telecaster.py b/telecaster.py
index 31d69fb..f5ccdb1 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -60,7 +60,7 @@ class TeleCaster:
         self.url = self.conf['infos']['url']
 
     def main(self):
-        odd_pid = get_pid('^oddcastv3\ -n', self.uid)
+        odd_pid = get_pid('^edcast_jack\ -n', self.uid)
         rip_pid = get_pid('streamripper ', self.uid)
         writing = False
         casting = False