Changeset 6761cd4

Timestamp:

Oct 22, 2003, 4:36:08 PM (21 years ago)

Author:

jhawk <jhawk>

Branches:

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

Children:

53d7625

Parents:

b281379

git-author:

jhawk <jhawk> (10/22/03 16:36:08)

git-committer:

jhawk <jhawk> (10/22/03 16:36:08)

Message:

Fix missing "

die" on ogg123.

Belated style cleanups:

80 column lines

"

die" not "or die"

File:

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

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.9 2003-10-22 20:27:44 jtwang Exp $
+# $Id: sipbmp3-filter,v 1.10 2003-10-22 20:36:08 jhawk Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -28 +28 @@
 
 # Attach necessary lockers
-system("/bin/athena/attach -h -n -q infoagents sipb outland consult 2>&1 > /dev/null");
+system("/bin/athena/attach -h -n -q infoagents sipb outland ' .
+    'consult 2>&1 > /dev/null");
 
 # Select the correct output device and set the volume
-system("/usr/local/bin/audio_setdevice -out headphones 100 2>&1 </dev/null > /dev/null");
+system("/usr/local/bin/audio_setdevice -out headphones 100 ' .
+    '2>&1 </dev/null > /dev/null");
 
 # The command line we get from lpd is (no spaces between options and args):
@@ -59 +61 @@
 
 # Status messages at start of playback
-open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
+open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
+  'sipbmp3@xcb -s "SIPB LPR music spooler"');
 print(ZEPHYR "User $opts{'n'} on host $opts{'H'} is playing:\n");
 
@@ -163 +166 @@
               elsif ($contenttype eq "application/ogg") { $format="OGG" }
               else {
-                  print ZEPHYR "Unknown Content-Type $contenttype for URI $uri\n";
+                  print ZEPHYR
+                      "Unknown Content-Type $contenttype for URI $uri\n";
                   close(ZEPHYR);
               }
@@ -169 +173 @@
           }
           else { # child
-              exec("/mit/sipb/bin/w3m","-dump_head",$uri) || die "Couldn't exec";
+              exec("/mit/sipb/bin/w3m", "-dump_head", $uri)
+                  || die "Couldn't exec";
           }
       } else {
@@ -221 +226 @@
 
   # Prepare to write status:
-  open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
+  open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
+       'sipbmp3@xcb -s "SIPB LPR music spooler"');
       
   # fork for mpg123
@@ -249 +255 @@
       # redirect STDERR to STDOUT
       open STDERR, '>&STDOUT';
-      exec("/mit/infoagents/bin/mpg123","-b16384","-q",$up,$uri) or die "Couldn't exec";
+      exec("/mit/infoagents/bin/mpg123", "-b16384", "-q", $up, $uri) ||
+          die "Couldn't exec";
   }
 }
@@ -366 +373 @@
 
     # Done. Status:
-    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
+    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
+         'sipbmp3@xcb -s "SIPB LPR music spooler"');
 
     # Check if there were any errors
@@ -460 +468 @@
       # redirect STDERR to STDOUT
       open STDERR, '>&STDOUT';
-      exec("/mit/sipb/bin/ogg123","-b40000","-dau","-q","-f","-",$uri);
+      exec("/mit/sipb/bin/ogg123","-b40000","-dau","-q","-f","-",$uri) ||
+          die "Couldn't exec";
   }
 }