X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=hacks%2Fvidwhacker;h=12192209fa5ef8d56acd64631b5e94ea2e8bbee6;hb=a719ec12b8b2563112366a8ac3196816fd64d2c7;hp=7bbc4079b920fbadd506fa1d78107ad44e8fed9e;hpb=c6b273ef7292ba10943694df1656b05203d7b62f;p=xscreensaver

diff --git a/hacks/vidwhacker b/hacks/vidwhacker
index 7bbc4079..12192209 100755
--- a/hacks/vidwhacker
+++ b/hacks/vidwhacker
@@ -95,6 +95,18 @@ grab() {
 
     qcam > $tmp_ppm1
 
+    # Friedrich Delgado Friedrichs says the following works with a
+    # Brooktree 848 or 878 tuner card:
+    #
+    #   bttvgrab -Q -d q -l 1 -F /dev/null -o gif -f ${tmp}.gif -N PAL
+    #   giftopnm ${tmp}.gif > $tmp_ppm1
+    #   rm ${tmp}.gif
+    #
+    # He notes that you might need to run a TV application (e.g., xawtv)
+    # before the first time you run vidwhacker in order to initialize the
+    # tuner card and kernel modules.
+
+
   else
     echo "$0: don't know how to grab video on this OS." >&2
     clean2
@@ -274,7 +286,7 @@ main() {
 
   getargs $@
 
-  trap my_trap 0 1 2 3 6 9 13
+  trap my_trap 0 1 2 3 6 9 13 15
 
   if [ "$use_stdin" = true ]; then
    cat > $tmp_ppm0
@@ -308,8 +320,18 @@ main() {
       if [ -s $tmp_ppm2 ]; then
         if [ "$verbose" = true ]; then
           echo "launching xv $xvargs $tmp_ppm2" >&2
+	  ls -lF $tmp_ppm2
         fi
-        xv $xvargs $tmp_ppm2 &
+
+	mv $tmp_ppm2 $tmp_ppm0
+        xv $xvargs $tmp_ppm0 &
+
+# this doesn't work -- leaves xv processes around, instead of stray xset
+# data.  Sigh.
+#
+#	# cat the file so that we can nuke it without racing against xv.
+#        cat $tmp_ppm2 | xv $xvargs - &
+
         pid=$!
       fi
     fi
@@ -324,4 +346,4 @@ main() {
 main $@
 
 # to find stray xv data:
-# xwininfo -root -children|grep 'xv image comments' | awk '{print $1}'
+# xwininfo -root -children|grep 'xv image comments' | awk '{print "xkill -id ", $1}'