Changeset 82d34e6

Timestamp:

Aug 10, 2003, 10:07:06 PM (21 years ago)

Author:

jhawk <jhawk>

Branches:

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

Children:

1db2bbb

Parents:

1282871

git-author:

jhawk <jhawk> (08/10/03 22:07:06)

git-committer:

jhawk <jhawk> (08/10/03 22:07:06)

Message:

Put under RCS.
Don't demand EXT-format, play straight URLs too based on content-type.

File:

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

gutenbach/debian/lib/sipbmp3-filter

@@ -2 +2 @@
 # Play the data on STDIN as an audio file
 #
-# $Id: sipbmp3-filter,v 1.5 2003-01-22 05:00:01 unknown Exp $
+# $Id: sipbmp3-filter,v 1.6 2003-08-11 02:07:06 jhawk Exp $
+# $Source: /tmp/tmp.UFBNno9997/RCS/sipbmp3-filter,v $
 #
 # TODO
@@ -81 +82 @@
 } elsif ($magic eq "EXT") {
   # This is an external stream reference (a jered-special)
-  &play_external_reference(\%opts);
+  &play_external_reference(\%opts, $magic);
+  exit 0;
+} elsif ($magic eq "htt") {
+  # This is an external stream reference (a jered-special)
+  &play_external_reference(\%opts, $magic);
   exit 0;
 } elsif ($magic eq "Ogg") {
@@ -101 +106 @@
     # Retrieve those command line opts.
     my %opts = %{shift(@_)};
+    my $magic = shift(@_);
 
     # External references are *not* playlists; they only support
@@ -117 +123 @@
     my $format, $uri, $userpass;
 
-    if (<STDIN> =~ /^EXT (.*)$/) {
-      # Found the header
-      $format = $1;
-    } else {
-      print ZEPHYR "Couldn't read EXT header\n";
+    if ("$magic" eq "EXT") {
+      if (<STDIN> =~ /^EXT (.*)$/) {
+        # Found the header
+        $format = $1;
+      } else {
+        print ZEPHYR "Couldn't read EXT header\n";
+        close(ZEPHYR);
+      }
+  
+      if (<STDIN> =~ /^(\S*)\s*(.*)$/) {
+        # Found the URI (and optionally user:pass)
+        $uri = $1;
+        if ($2) {
+        $userpass = $2;
+        }
+      } else {
+        print ZEPHYR "Couldn't read URI for external reference\n";
+        close(ZEPHYR);
+      }
+  } elsif ("$magic" eq "htt") {
+      if (<STDIN> =~ /^(\S*)\s*(.*)$/) {
+          $uri=$1;
+          open(W3M, "/mit/sipb/bin/w3m -dump_head $uri|");
+          $contenttype="unknown";
+          while (<W3M>) {
+              if ($_ =~ /^Content-Type:\s(\S*)/) {
+                  $contenttype=$1;
+              }
+          }
+             if ($contenttype eq "audio/mpeg") { $format="MP3" }
+          elsif ($contenttype eq "audio/ogg") { $format="OGG" }
+          else {
+              print ZEPHYR "Unknown Content-Type $contenttype trying to /mit/sipb/bin/w3m -dump_head $uri\n";
+              close(ZEPHYR);
+          }
+      } else {
+        print ZEPHYR "Couldn't read URI for external reference\n";
+        close(ZEPHYR);
+      }
+  } else {
+      print ZEPHYR "Unknown syntax in play_external_reference(): $magic\n";
       close(ZEPHYR);
-    }
-
-    if (<STDIN> =~ /^(\S*)\s*(.*)$/) {
-      # Found the URI (and optionally user:pass)
-      $uri = $1;
-      if ($2) {
-        $userpass = $2;
-      }
-    } else {
-      print ZEPHYR "Couldn't read URI for external reference\n";
-      close(ZEPHYR);
-    }
+  }
 
     # Echo the rest to the zephyr