Changeset a041c73

Timestamp:

Feb 19, 2009, 7:27:17 PM (16 years ago)

Author:

geofft <geofft>

Branches:

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

Children:

6d813c3

Parents:

908107d

git-author:

geofft <geofft> (02/19/09 19:27:17)

git-committer:

geofft <geofft> (02/19/09 19:27:17)

Message:

r1.25 broke playing non-files. Fix that.

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.25 2009-02-09 00:07:49 geofft Exp $
+# $Id: sipbmp3-filter,v 1.26 2009-02-20 00:27:17 geofft Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -96 +96 @@
         printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
     }
+    my $tempdir = tempdir();
+    my $newpath = $tempdir . '/' . basename($opts{'J'});
+    symlink($filepath, $newpath);
+    $filepath = $newpath;
 }
 elsif ($opts{'C'} eq 'Z') {
@@ -108 +112 @@
     exit 0;
 }
+
 #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'));
 close(ZEPHYR);
 play_mplayer_audio($filepath, \%opts);
+
+if ($magic) {
+    unlink($newpath);
+    rmdir($tempdir);
+}
 
 # Play an external stream reference
@@ -208 +218 @@
     }
     
-    my $tempdir = tempdir();
-    my $newpath = $tempdir . '/' . basename($opts{'J'});
-    symlink($filepath, $newpath);
     if ($pid) { #parent
         # Check if there were any errors
@@ -225 +232 @@
         
         close(ZEPHYR);
-        unlink($newpath);
-        rmdir($tempdir);
     }
   else { # child
@@ -235 +240 @@
       open(STDIN, "/dev/null");
       #print STDERR Dumper([qw|/usr/bin/mplayer -nolirc -ao alsa -quiet|, $filepath]);
-      my @args = (qw|/usr/bin/mplayer -vo null -nolirc -ao alsa -cache 512 -really-quiet|, $newpath);
+      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) ||