From ae607ea3544c66110187aab7098ee7ba60f66894 Mon Sep 17 00:00:00 2001
From: yomguy <yomguy@parisson.com>
Date: Thu, 6 May 2010 18:38:45 +0000
Subject: [PATCH] remove jack module, fix remaining streamripper process,
 default mono input on jack-rack, change default conf file paths to
 /etc/telecaster/

---
 etc/pre-barreau_conferences.xml |  2 +-
 etc/telecaster_edcast_mp3.cfg   |  8 ++++----
 etc/telecaster_mp3.xml          |  9 +++------
 station.py                      | 10 +++++++---
 telecaster.py                   |  7 +++++--
 5 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/etc/pre-barreau_conferences.xml b/etc/pre-barreau_conferences.xml
index d995041..630b3f7 100644
--- a/etc/pre-barreau_conferences.xml
+++ b/etc/pre-barreau_conferences.xml
@@ -1,5 +1,5 @@
 <telecaster>
-    <host>augustins.pre-barreau.com</host>
+    <host>telecaster-04.parisson.com</host>
     <title>Pre-Barreau</title>
     <port>8000</port>
     <format>mp3</format>
diff --git a/etc/telecaster_edcast_mp3.cfg b/etc/telecaster_edcast_mp3.cfg
index a5a4625..60836bb 100644
--- a/etc/telecaster_edcast_mp3.cfg
+++ b/etc/telecaster_edcast_mp3.cfg
@@ -21,8 +21,8 @@ Encode=MP3
 BitrateNominal=64
 BitrateMin=32
 BitrateMax=128
-NumberChannels=2
-Samplerate=48000
+NumberChannels=1
+Samplerate=44100
 #
 SaveDirectoryFlag=1
 SaveDirectory=/home/pre-barreau/backup
@@ -32,8 +32,8 @@ SaveAsWAV=0
 OggQuality=3
 OggBitrateQualityFlag=Quality
 # LAME specific settings.  Note: Setting the low/highpass freq to 0 will disable them.
-LameCBRFlag=1
-LameQuality=0
+LameCBRFlag=0
+LameQuality=5
 LameCopywrite=0
 LameOriginal=0
 LameStrictISO=0
diff --git a/etc/telecaster_mp3.xml b/etc/telecaster_mp3.xml
index 3952278..fa7361b 100644
--- a/etc/telecaster_mp3.xml
+++ b/etc/telecaster_mp3.xml
@@ -3,7 +3,7 @@
         <short_name>Pre-Barreau</short_name>
         <name>Pre-Barreau</name>
         <description>La preparation au Barreau de Paris</description>
-        <url>http://augustins.pre-barreau.com</url>
+        <url>http:///telecaster-04.parisson.com</url>
         <genre>Other</genre>
     </infos>
     <server>
@@ -25,16 +25,13 @@
         <raw_dir>/home/pre-barreau/backup</raw_dir>
         <format>mp3</format>
         <bitrate>96</bitrate>
-        <channels>2</channels>
+        <channels>1</channels>
         <ogg_quality>3</ogg_quality>
         <samplerate>44100</samplerate>
     </media>
     <jack>
         <input>
-        <name>jack_rack:out_1</name>
-        </input>
-        <input>
-        <name>jack_rack:out_2</name>
+        <name>system:capture_1</name>
         </input>
     </jack>
 </telecaster>
diff --git a/station.py b/station.py
index 5909227..5d6c49e 100644
--- a/station.py
+++ b/station.py
@@ -44,7 +44,7 @@ import urllib
 import codecs
 import string
 import signal
-import jack
+#import jack
 import unicodedata
 from tools import *
 from mutagen.oggvorbis import OggVorbis
@@ -126,8 +126,12 @@ class Station(Conference):
 
         self.jack_inputs = []
         if 'jack' in self.conf:
-            for jack_input in self.conf['jack']['input']:
-                self.jack_inputs.append(jack_input['name'])
+            jack_inputs = self.conf['jack']['input']
+            if len(jack_inputs) > 1: 
+                for jack_input in jack_inputs:
+                    self.jack_inputs.append(jack_input['name'])
+            else:
+                self.jack_inputs.append(jack_inputs['name'])
 
     def set_oddcast_conf(self):
         #oddconf_temp = NamedTemporaryFile(suffix='.cfg')
diff --git a/telecaster.py b/telecaster.py
index 9a45e06..d87e679 100755
--- a/telecaster.py
+++ b/telecaster.py
@@ -94,6 +94,9 @@ class TeleCaster:
                         'professor': form.getfirst("professor"),
                         'comment': form.getfirst("comment")}
 
+            if rip_pid != []:
+                os.system('kill -9 '+rip_pid[0])
+                time.sleep(3)
             s = Station(self.conf_file, self.conference_dict, self.lock_file)
             s.start()
             time.sleep(1)
@@ -117,8 +120,8 @@ class TeleCaster:
 
 
 # Call main function.
-conf_file = 'etc/telecaster_mp3.xml'
-school_file = 'etc/pre-barreau_conferences.xml'
+conf_file = '/etc/telecaster/telecaster_mp3.xml'
+school_file = '/etc/telecaster/pre-barreau_conferences.xml'
 
 if __name__ == '__main__':
     t = TeleCaster(conf_file, school_file)
-- 
2.39.5