From: yomguy <yomguy@parisson.com>
Date: Fri, 8 Jul 2011 01:41:32 +0000 (+0000)
Subject: add gst-launch to vncserver
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=bed66c6613954c605c904d8c3feffc62b6b03207;p=telecaster-cgi.git

add gst-launch to vncserver
---

diff --git a/conf/etc/init.d/vncserver b/conf/etc/init.d/vncserver
index 9411a01..fbeaa53 100755
--- a/conf/etc/init.d/vncserver
+++ b/conf/etc/init.d/vncserver
@@ -51,6 +51,7 @@ case "$1" in
 		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 gst-launch-0.10" $USER
 			sleep 1
                         su -c "vncserver -kill :$PORT" $USER
         		log_end_msg 0
diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu
index bd1a913..d5012e8 100644
--- a/conf/home/fluxbox/startup.ubuntu
+++ b/conf/home/fluxbox/startup.ubuntu
@@ -54,6 +54,12 @@ jack_connect jack_rack:out_1  LIVE:in_2
 
 # Start safe DeeFuzzer
 deefuzzer /etc/telecaster/deefuzzer_safe.xml > /dev/null &
+/home/telecaster/apps/telecaster/tools/ffmpeg_dv_jack_fifo_shout start > /dev/null &
+sleep 3
+
+jack_disconnect system:capture_1 gst-launch-0.10:in_jackaudiosrc0_1
+jack_connect jack_rack:out_1  gst-launch-0.10:in_jackaudiosrc0_1
+
 
 } &