Changeset c711ed9

Timestamp:

Sep 28, 2008, 7:36:26 PM (16 years ago)

Author:

geofft <geofft>

Branches:

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

Children:

7e27cc3

Parents:

f3974e2

git-author:

geofft <geofft> (09/28/08 19:36:26)

git-committer:

geofft <geofft> (09/28/08 19:36:26)

Message:

make the zephyrs shorter

File:

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

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.17 2008-09-27 21:35:09 root Exp $
+# $Id: sipbmp3-filter,v 1.18 2008-09-28 23:36:26 geofft Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -13 +13 @@
 #
 # Jered Floyd <jered@mit.edu> takes very little credit for this code
+# apparently neither does Quentin Smith <quentin@mit.edu>
 
 use Getopt::Std;
@@ -65 +66 @@
 open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
   'sipbmp3@zsr -s "SIPB LPR music spooler"');
-print(ZEPHYR "User $opts{'n'} on host $opts{'H'} is playing:\n");
+print(ZEPHYR "$opts{'n'}\@$opts{'H'} is playing:\n");
 
 # So, the file we're currently processing is "-d/-e".
@@ -75 +76 @@
 
 if ($magic) {
-    printf(ZEPHYR "A file of type %s.\n", $magic);
-    foreach my $key (qw/Title Artist Album AlbumArtist Tracknumber TrackDuration MIMEType/) {
-        printf(ZEPHYR "%s: %s\n", $key, $fileinfo->{$key}) if exists $fileinfo->{$key};
+    printf(ZEPHYR "%s file %s\n", $magic, $opts{'J'});
+    printf(ZEPHYR "\@b(%s)\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
+    foreach my $key (qw/Artist Album AlbumArtist Tracknumber TrackDuration/) {
+        printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
     }
 }
@@ -187 +189 @@
       open(STDIN, "/dev/null");
       #print STDERR Dumper([qw|/usr/bin/mplayer -nolirc -ao alsa -quiet|, $filepath]);
-      exec(qw|/usr/bin/mplayer -nolirc -ao alsa -quiet|, $filepath) ||
+      exec(qw|/usr/bin/mplayer -nolirc -ao alsa -really-quiet|, $filepath) ||
           die "Couldn't exec";
   }