restrict checking deefuzzer to telecaster's one

diff --git a/station.py b/station.py
index c97161995e0f4798880b11d7335d4ec59a296e4d..b30be64424cc5812b361288337132237c93bc5a1 100644 (file)
--- a/station.py
+++ b/station.py
@@ -106,7 +106,7 @@ class Station(Conference):
         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.deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.deefuzzer_user_file, 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.genre = self.conf['infos']['genre']

diff --git a/telecaster.py b/telecaster.py
index f69e327f77994baec27909de710119c077e986f5..811b95764611b98fdeef96eef2238fc1ef2b7857 100755 (executable)
--- a/telecaster.py
+++ b/telecaster.py
@@ -72,7 +72,7 @@ class TeleCaster:
 
     def main(self):
         edcast_pid = get_pid('edcast_jack', self.uid)
-        deefuzzer_pid = get_pid('/usr/bin/deefuzzer', self.uid)
+        deefuzzer_pid = get_pid('/usr/bin/deefuzzer '+self.user_dir+os.sep+'deefuzzer.xml', self.uid)
         writing = edcast_pid != []
         casting = deefuzzer_pid != []