Changeset b011fb0

Timestamp:

Oct 14, 2008, 6:20:50 AM (16 years ago)

Author:

quentin <quentin>

Branches:

master, debian, mac, no-cups, nodebathena, web

Children:

de4ce86

Parents:

73cfabc

git-author:

quentin <quentin> (10/14/08 06:20:50)

git-committer:

quentin <quentin> (10/14/08 06:20:50)

Message:

Improve URL streaming support

File:

• gutenbach/debian/lib/sipbmp3-filter (modified) (6 diffs)

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.22 2008-10-07 00:20:36 quentin Exp $
+# $Id: sipbmp3-filter,v 1.23 2008-10-14 10:20:50 quentin Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -74 +74 @@
 @ARGV = @NEWARGV;
 
+printf(STDERR Dumper(\%opts));
+
 # Status messages at start of playback
 open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
@@ -95 +97 @@
 elsif ($opts{'C'} eq 'Z') {
     $filepath = resolve_external_reference($filepath, \%opts);
+    print STDERR "Resolved external reference to $filepath\n";
     printf(ZEPHYR "%s\n", $filepath);
+    close(ZEPHYR);
 }
 elsif (-T $filepath) {
@@ -102 +106 @@
     exit 0;
 }
-printf(STDERR Dumper(\%opts));
 #printf(STDERR "Job priority %s\n", $opts{'C'}) if $opts{'C'} eq 'Z';
 #printf(ZEPHYR "Job priority %s\n", $opts{'C'}) if ($opts{'C'} && ($opts{'C'} ne 'A'));
@@ -129 +132 @@
             print ZEPHYR
                 "Unknown Content-Type $contenttype for URI $uri\n";
-            close(ZEPHYR);
         }
     } else {
         print ZEPHYR "Couldn't read URI for external reference\n";
-        close(ZEPHYR);
         return $filepath;
     }
@@ -227 +228 @@
       open(STDIN, "/dev/null");
       #print STDERR Dumper([qw|/usr/bin/mplayer -nolirc -ao alsa -quiet|, $filepath]);
-      exec(qw|/usr/bin/mplayer -nolirc -ao alsa -really-quiet|, $filepath) ||
+      my @args = (qw|/usr/bin/mplayer -vo null -nolirc -ao alsa -cache 512 -really-quiet|, $filepath);
+      #print STDERR "About to exec: ", Dumper([@args]);
+      exec(@args) ||
           die "Couldn't exec";
   }