X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=driver%2Fxscreensaver-getimage-video;h=cc8d99d3545196cf590d16c91d8398d6805cddb7;hb=2762a7d7cf8d83e68b8f635941f6609119d630ae;hp=32117ff23589e7cd60bc7ab24277a19a5fcaf72f;hpb=6b1c86cf395f59389e4ece4ea8f4bea2c332745b;p=xscreensaver

diff --git a/driver/xscreensaver-getimage-video b/driver/xscreensaver-getimage-video
index 32117ff2..cc8d99d3 100755
--- a/driver/xscreensaver-getimage-video
+++ b/driver/xscreensaver-getimage-video
@@ -1,5 +1,5 @@
 #!/usr/bin/perl -w
-# Copyright © 2001-2008 Jamie Zawinski <jwz@jwz.org>.
+# Copyright © 2001-2013 Jamie Zawinski <jwz@jwz.org>.
 #
 # Permission to use, copy, modify, distribute, and sell this software and its
 # documentation for any purpose is hereby granted without fee, provided that
@@ -18,9 +18,10 @@
 # "jigsaw", etc.) get the image to manipulate by running the
 # "xscreensaver-getimage" program.
 #
-# "xscreensaver-getimage" will invoke this program, depending on the
-# value of the "grabVideoFrames" setting in the ~/.xscreensaver file
-# (or in /usr/lib/X11/app-defaults/XScreenSaver).
+# The various screen savers invoke "xscreensaver-getimage", which will in
+# turn invoke this program, depending on the value of the "grabVideoFrames"
+# setting in the ~/.xscreensaver file (or in the app-defaults file, usually
+# /usr/lib/X11/app-defaults/XScreenSaver).
 #
 # Created: 13-Apr-2001.
 
@@ -29,14 +30,12 @@ require 5;
 use strict;
 
 my $progname = $0; $progname =~ s@.*/@@g;
-my $version  = q{ $Revision: 1.18 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
+my $version  = q{ $Revision: 1.22 $ }; $version =~ s/^[^0-9]+([0-9.]+).*$/$1/;
 
 my $tmpdir   = $ENV{TMPDIR} || "/tmp";
 my $tmpfile  = sprintf("%s/xssv.%08x.ppm", $tmpdir, rand(0xFFFFFFFF));
 
-my $verbose           = 0;
-my $use_stdout_p      = 0;
-my $return_filename_p = 0;
+my $verbose = 0;
 
 
 # These are programs that can be used to grab a video frame.  The first one
@@ -69,6 +68,11 @@ my @programs = (
 
   "vidtomem -f $tmpfile 2>&- " .		# Silicon Graphics
 	"&& mv $tmpfile-00000.rgb $tmpfile",
+
+  # "mplayer -really-quiet tv://0 " .		# Maybe works with some cams?
+  #         "-ao null -vo pnm -frames 1 2>&- " .
+  #	"&& mv 00000001.ppm $tmpfile",
+
 );
 
 
@@ -106,46 +110,13 @@ sub grab_image() {
   print STDERR "$progname: executing \"$cmd\"\n" if ($verbose);
   system ($cmd);
 
-  if (-z $tmpfile)
-    {
-      unlink $tmpfile;
-      error ("\"$cmd\" produced no data.");
-    }
-
-  if ($return_filename_p) {
-    print STDERR "$progname: wrote \"$tmpfile\"\n" if ($verbose);
-    print STDOUT "$tmpfile\n";
-
-  } elsif ($use_stdout_p) {
-    local *IN;
-    my $ppm = "";
-    my $reader  = "<$tmpfile";
-
-    # horrid kludge for SGIs, since they don't use PPM...
-    if ($cmd =~ m/^vidtomem\s/) {
-      $reader = "sgitopnm $tmpfile";
-      $reader .= " 2>/dev/null" if ($verbose <= 1);
-      $reader .= " |";
-    }
-
-    open(IN, $reader) || error ("reading $tmpfile: $!");
-    print STDERR "$progname: reading $tmpfile\n" if ($verbose > 1);
-    while (<IN>) { $ppm .= $_; }
-    close IN;
-    unlink $tmpfile;
-    print STDOUT $ppm;
-
-  } else {
-
-    $cmd = "xscreensaver-getimage-file";
-    $cmd .= " --verbose" if ($verbose);
-    $cmd .= " $tmpfile";
-
-    print STDERR "$progname: executing \"$cmd\"\n" if ($verbose);
-    system ($cmd);
-
+  if (! -s $tmpfile) {
     unlink $tmpfile;
+    error ("\"$cmd\" produced no data.");
   }
+
+  print STDERR "$progname: wrote \"$tmpfile\"\n" if ($verbose);
+  print STDOUT "$tmpfile\n";
 }
 
 
@@ -157,14 +128,12 @@ sub usage() {
 sub main() {
   while ($_ = $ARGV[0]) {
     shift @ARGV;
-    if ($_ eq "--verbose") { $verbose++; }
-    elsif (m/^-v+$/) { $verbose += length($_)-1; }
-    elsif (m/^--?stdout$/) { $use_stdout_p = 1; }
-    elsif (m/^--?name$/)   { $return_filename_p = 1; }
-    elsif (m/^-./) { usage; }
-    else { usage; }
+    if    (m/^--?verbose$/s) { $verbose++; }
+    elsif (m/^-v+$/s)        { $verbose += length($_)-1; }
+    elsif (m/^--?name$/s)    { }   # ignored, for compatibility
+    elsif (m/^-./)           { usage; }
+    else                     { usage; }
   }
-
   grab_image();
 }