video branch created, rm video tools

diff --git a/conf/home/fluxbox/startup.ubuntu b/conf/home/fluxbox/startup.ubuntu
index d5012e85b7aca6bea31285d14b6a6d67687bafee..ee3e8fe29042b7a0903ee1a99ae946d21b929a81 100644 (file)
--- a/conf/home/fluxbox/startup.ubuntu
+++ b/conf/home/fluxbox/startup.ubuntu
@@ -54,11 +54,11 @@ 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
+#/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
 
 
 } &

diff --git a/webview.py b/webview.py
index 92a2227582814d1085e3650220bf95344171c2c8..4e3bff00e8467ccabf5bade95e0f797f4ffbd072 100644 (file)
--- a/webview.py
+++ b/webview.py
@@ -188,7 +188,7 @@ class WebView(FieldStorage):
         print "<div class=\"hardware\">"
         print "<div class=\"title\">Status</div>"
 
-        self.video()
+        #self.video()
 
         print "<table class=\"hardware\">"
         print "<tr><td>Name</td><TD> : </TD>"