Changeset 6761cd4 for gutenbach


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • gutenbach/debian/lib/sipbmp3-filter

    rb281379 r6761cd4  
    22# Play the data on STDIN as an audio file
    33#
    4 # $Id: sipbmp3-filter,v 1.9 2003-10-22 20:27:44 jtwang Exp $
     4# $Id: sipbmp3-filter,v 1.10 2003-10-22 20:36:08 jhawk Exp $
    55# $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
    66#
     
    2828
    2929# Attach necessary lockers
    30 system("/bin/athena/attach -h -n -q infoagents sipb outland consult 2>&1 > /dev/null");
     30system("/bin/athena/attach -h -n -q infoagents sipb outland ' .
     31    'consult 2>&1 > /dev/null");
    3132
    3233# Select the correct output device and set the volume
    33 system("/usr/local/bin/audio_setdevice -out headphones 100 2>&1 </dev/null > /dev/null");
     34system("/usr/local/bin/audio_setdevice -out headphones 100 ' .
     35    '2>&1 </dev/null > /dev/null");
    3436
    3537# The command line we get from lpd is (no spaces between options and args):
     
    5961
    6062# Status messages at start of playback
    61 open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
     63open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
     64  'sipbmp3@xcb -s "SIPB LPR music spooler"');
    6265print(ZEPHYR "User $opts{'n'} on host $opts{'H'} is playing:\n");
    6366
     
    163166              elsif ($contenttype eq "application/ogg") { $format="OGG" }
    164167              else {
    165                   print ZEPHYR "Unknown Content-Type $contenttype for URI $uri\n";
     168                  print ZEPHYR
     169                      "Unknown Content-Type $contenttype for URI $uri\n";
    166170                  close(ZEPHYR);
    167171              }
     
    169173          }
    170174          else { # child
    171               exec("/mit/sipb/bin/w3m","-dump_head",$uri) || die "Couldn't exec";
     175              exec("/mit/sipb/bin/w3m", "-dump_head", $uri)
     176                  || die "Couldn't exec";
    172177          }
    173178      } else {
     
    221226
    222227  # Prepare to write status:
    223   open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
     228  open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
     229       'sipbmp3@xcb -s "SIPB LPR music spooler"');
    224230     
    225231  # fork for mpg123
     
    249255      # redirect STDERR to STDOUT
    250256      open STDERR, '>&STDOUT';
    251       exec("/mit/infoagents/bin/mpg123","-b16384","-q",$up,$uri) or die "Couldn't exec";
     257      exec("/mit/infoagents/bin/mpg123", "-b16384", "-q", $up, $uri) ||
     258          die "Couldn't exec";
    252259  }
    253260}
     
    366373
    367374    # Done. Status:
    368     open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
     375    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
     376         'sipbmp3@xcb -s "SIPB LPR music spooler"');
    369377
    370378    # Check if there were any errors
     
    460468      # redirect STDERR to STDOUT
    461469      open STDERR, '>&STDOUT';
    462       exec("/mit/sipb/bin/ogg123","-b40000","-dau","-q","-f","-",$uri);
     470      exec("/mit/sipb/bin/ogg123","-b40000","-dau","-q","-f","-",$uri) ||
     471          die "Couldn't exec";
    463472  }
    464473}
Note: See TracChangeset for help on using the changeset viewer.