Changeset ab55f2e

Timestamp:

Feb 22, 2004, 11:50:57 AM (21 years ago)

Author:

arolfe <arolfe>

Branches:

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

Children:

d414b9c

Parents:

53d7625

git-author:

arolfe <arolfe> (02/22/04 11:50:57)

git-committer:

arolfe <arolfe> (02/22/04 11:50:57)

Message:

fixed playing of ogg streams

File:

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

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.11 2003-10-24 20:31:42 jtwang Exp $
+# $Id: sipbmp3-filter,v 1.12 2004-02-22 16:50:57 arolfe Exp $
 # $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
@@ -478 +478 @@
 
 # Play an OggVorbis audio stream (doesn't support auth!)
-# play_ogg_stream(URI, userpass)
+# play_ogg_stream(URI)
+#  Mostly copied from play_ogg_audio
 sub play_ogg_stream {
   my $uri = shift(@_);
-  my $userpass = shift(@_);
 
   system("chmod a+rw /dev/audio");
@@ -489 +489 @@
   # Prepare to write status:
   open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i sipbmp3@xcb -s "SIPB LPR music spooler"');
-
-  # fork for ogg123
-  my $pid = open(OGGSTATUS, "-|");
-  unless (defined $pid) {
-      print ZEPHYR "Couldn't fork: $!\n";
-      close(ZEPHYR);
-      return;
-  }
-  if ($pid) { # parent
-      # Check if there were any errors
-      if ($_ = <OGGSTATUS>) {
-          print ZEPHYR "Playback completed with the following errors:\n";
-          print ZEPHYR $_;
-          while (<OGGSTATUS>) {
-              print ZEPHYR $_;
-          }
-      } else {
-          print ZEPHYR "Playback completed successfully.\n";
-      }
-      close(OGGSTATUS) || print ZEPHYR "ogg123 exited $?\n";
-            
-      close(ZEPHYR);
-  }
-  else { #child
-      # redirect STDERR to STDOUT
-      open STDERR, '>&STDOUT';
-      exec("/mit/sipb/bin/ogg123","-b40000","-dau","-q","-f","-",$uri) ||
-          die "Couldn't exec";
-  }
+  system("/mit/sipb/bin/ogg123 -b 40000 -dau -q -f - $uri 2> /tmp/ogg123.out | audioplay");
+
+  # Check if there were any errors
+  open(OGGSTATUS, "/tmp/ogg123.out");
+  if ($_ = <OGGSTATUS>) {
+    print ZEPHYR "Playback completed with the following errors:\n";
+    print ZEPHYR $_;
+    while (<OGGSTATUS>) {
+      print ZEPHYR $_;
+    }
+  } else {
+    print ZEPHYR "Playback completed successfully.\n";
+    # Repeat tag data for those playing at home
+    if (!$ogginfo{'title'}) {
+      print ZEPHYR "No ogginfo data found\n";
+      print ZEPHYR "Filename: $opts{'J'}\n\n";
+    } else {
+      print ZEPHYR "Title          : $ogginfo{'title'}\n";
+      print ZEPHYR "Artist         : $ogginfo{'artist'}\n";
+      print ZEPHYR "Album          : $ogginfo{'album'}\n";
+      print ZEPHYR "Track #        : $ogginfo{'tracknumber'}\n";
+
+      # others
+      while (($key,$val) = each %lessinfo) {
+        printf ZEPHYR "%-15s: %s\n", $key, $val;
+      }
+    }
+  }
+
+  close(OGGSTATUS);
+  unlink(OGGSTATUS);
+
+  close(ZEPHYR);
 }