From: yomguy <yomguy@parisson.com>
Date: Tue, 31 Jan 2012 08:06:24 +0000 (+0100)
Subject: fix deefuzzer kill
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=a911d0544dcd2206968833ce69a3ce24052fcb9c;p=telecaster-cgi.git

fix deefuzzer kill
---

diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index fbeaa53..f087c80 100755
--- a/conf/etc/init.d/vncserver
+++ b/conf/etc/init.d/vncserver
@@ -49,8 +49,9 @@ case "$1" in
 	        log_begin_msg "Stopping vncserver audio server:" "vncserver"
                 pid=`cat $PIDFILE | sed -e 's/\s.*//'|head -n1` 
 		if [ ! pid = '' ]; then
-			su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_safe.xml\" "
-			su -c "pkill -9 edcast_jack" $USER
+			su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_audio_safe.xml\" "
+			su -c "pkill -9 -f \"deefuzzer /etc/telecaster/deefuzzer_video_safe.xml\" "
+                	su -c "pkill -9 edcast_jack" $USER
                         su -c "pkill -9 gst-launch-0.10" $USER
 			sleep 1
                         su -c "vncserver -kill :$PORT" $USER
diff --git a/conf/etc/telecaster/deefuzzer_video_safe.xml b/conf/etc/telecaster/deefuzzer_video_safe.xml
index c91fd06..d1bc791 100644
--- a/conf/etc/telecaster/deefuzzer_video_safe.xml
+++ b/conf/etc/telecaster/deefuzzer_video_safe.xml
@@ -47,7 +47,7 @@
             <url>http://parisson.com.com</url>
             <genre>Vocal</genre>
             <name>safe</name>
-            <short_name>publish/safe</short_name>
+            <short_name>safe</short_name>
             <description>TeleCaster safe video stream</description>
         </infos>
         <rss>