fix deefuzzer kill

diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index fbeaa5318b0af3e0a5ec2bc62427960a93d6c0aa..f087c8010775b3388ee5a1793275561ae9d70f24 100755 (executable)
--- 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 c91fd063712e5bfcc97826980ed29058d1c10856..d1bc7912292982a9c6ba3eae01b60614ab42451f 100644 (file)
--- 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>