Changeset d1a3d62

Timestamp:

Jun 24, 2010, 1:49:52 AM (14 years ago)

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

nodebathena

Children:

5a05bf2

Parents:

56954d4

git-author:

Kyle C. Brogle <broglek@…> (06/10/10 15:12:26)

git-committer:

Jessica B. Hamrick <jhamrick@…> (06/24/10 01:49:52)

Message:

Removed dependancies on debathena packages
Moved gutenbach filter to gutenbach.old
Removed all zephyr-related code from filter for non-debathena version

Location:

debian

Files:

• control (modified) (1 diff)
• lib/gutenbach (modified) (13 diffs)
• lib/gutenbach.old (added)

debian/control

@@ -9 +9 @@
 Architecture: all
 Pre-Depends: debconf
-Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, libimage-exiftool-perl, cups, debathena-cupsys-config, sysv-rc, adduser, debathena-zephyr-config, libzephyr4-krb5, alsa-base
+Depends: ${shlibs:Depends}, ${misc:Depends}, mplayer, libimage-exiftool-perl, cups, sysv-rc, adduser, alsa-base
 Conflicts: pulseaudio
 Provides: pulseaudio

debian/lib/gutenbach

@@ -94 +94 @@
 printf(STDERR "Got \%arguments: %s\n", Dumper(\%arguments));
 
-# Open up a zwrite command to announce the current track.
-my @zwrite_command = (qw(/usr/bin/zwrite -d -n -c), $zephyr_class, "-i", $queue.'@'.$host, "-s", "Gutenbach Music Spooler");
-
-print STDERR "Invoking @zwrite_command\n";
-open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
+
 
 my $status;
 if (exists($arguments{"options"}{"job-originating-host-name"})) {
-    print(ZEPHYR $arguments{"user"},"\@",$arguments{"options"}{"job-originating-host-name"}," is playing:\n");
+    
     $status = "User: ".$arguments{"user"}."\@".$arguments{"options"}{"job-originating-host-name"};
 } else {
-    print(ZEPHYR $arguments{"user"}," is playing:\n");
+    
     $status = "User: ".$arguments{"user"};
 }
@@ -112 +108 @@
 sub clear_status {
   kill 15, $pid if $pid;
-  my @zwrite_command = (qw(/usr/bin/zwrite -d -n -c), $zephyr_class, "-i", $queue.'@'.$host, "-s", "Gutenbach Music Spooler");
-  open(ZEPH, "|-", @zwrite_command);
-  print(ZEPH "Playback aborted.\n");
-  close(ZEPH);
   die;
 }
@@ -131 +123 @@
 if ($magic) {
   # $magic means that Image::ExifTool was able to identify the type of file
-  printf(ZEPHYR "%s file %s\n", $magic, $arguments{"job-title"});
   $status .= sprintf(" Filetype: %s.", $magic);
   $status .= sprintf(" Filename: %s.", $arguments{"job-title"});
 
   if (exists $fileinfo->{'Title'}) {
-    printf(ZEPHYR "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
+    
     $status .= sprintf(" Title: %s.", $fileinfo->{'Title'});
   }
   foreach my $key (qw/Artist Album AlbumArtist/) {
     if (exists $fileinfo->{$key}) {
-      printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
+      
       $status .= sprintf(" %s: %s\n", $key, $fileinfo->{$key});
     }
@@ -167 +158 @@
     # Read the title (currently not doing so because youtube-dl doesn't know how to get the title.
     my $title = ""; # <YTDL>
-    # Print the title to zephyr and the status string.
-    print ZEPHYR "YouTube video $filepath\n$title";
+    # Print the title to the status string.
+    
     $status .= " YouTube video $filepath. $title.";
     # youtube-dl prints the URL of the flash video, which we pass to mplayer as a filename.
@@ -175 +166 @@
   } else { # Doesn't appear to be a YouTube URL.
     print STDERR "Resolved external reference to $filepath\n";
-    printf(ZEPHYR "%s\n", $filepath);
+    
     $status .= sprintf(" External: %s\n", $filepath);
   }
@@ -181 +172 @@
 elsif (-T $filepath) { # If the file appears to be a text file, treat it as a playlist.
   split_playlist($filepath, \%arguments);
-  close(ZEPHYR);
+  
   # See http://www.cups.org/documentation.php/api-filter.html#MESSAGES
   print CUPS "NOTICE: $status\n";
@@ -187 +178 @@
 }
 
-close(ZEPHYR);
+
 print CUPS "NOTICE: $status\n";
 play_mplayer_audio($filepath, \%arguments);
@@ -223 +214 @@
     elsif ($contenttype eq "audio/x-scpls") { $format="SHOUTCAST" }
     else {
-      print ZEPHYR
-        "Unknown Content-Type $contenttype for URI $uri\n";
+    
     }
   } else { # Unable to match the URL regex
-    print ZEPHYR "Couldn't read URI for external reference\n";
+    
     # Return the existing path, in the hopes that mplayer knows what to do with it.
     return $filepath;
@@ -233 +223 @@
 
   if ($format eq "SHOUTCAST") {
-    print ZEPHYR "Shoutcast playlist...\n";
+    
     return get_shoutcast($uri);
   } elsif ($format eq "MP3") {
   } elsif ($format eq "OGG") {
   } else {
-    print ZEPHYR "Unrecognized stream format: $format\n";
+    
   }
   return $uri;
@@ -259 +249 @@
     }
   }
-  printf(ZEPHYR "Playlist containing %d valid entries, split into separate jobs.\n", $i);
+  
 }
 
@@ -282 +272 @@
   my $server = int(rand scalar(@uris));
   # print the name of the stream if available
-  print ZEPHYR "$titles[$server]\n";
+ 
   return $uris[$server];
 }
@@ -289 +279 @@
   my ($filepath, $opts) = @_;
 
-  # Open up a zwrite command to show the mplayer output
-  my @zwrite_command = (qw(/usr/bin/zwrite -d -n -c), $zephyr_class, "-i", $queue.'@'.$host, "-s", "Gutenbach Music Spooler");
-
-  print STDERR "Invoking (from play_mplayer_audio): @zwrite_command\n";
 
   # fork for mplayer
   $pid = open(MP3STATUS, "-|");
   unless (defined $pid) {
-    open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
-    print ZEPHYR "Couldn't fork: $!\n";
-    close(ZEPHYR);
     return;
   }
@@ -306 +289 @@
     # Check if there were any errors
     if ($_ = <MP3STATUS>) {
-      open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
-      print ZEPHYR "Playback completed with the following errors:\n";
+     
       while (<MP3STATUS>) {
-        print ZEPHYR $_;
+        
       }
-      close(ZEPHYR);
+      
     } else {
-      open(ZEPHYR, "|-", @zwrite_command) or die "Couldn't launch zwrite: $!";
-      print ZEPHYR "Playback completed successfully.\n";
-      close(ZEPHYR);
-    }
-    close(MP3STATUS) || print ZEPHYR "mplayer exited $?\n";
+      
+    }
+    close(MP3STATUS);
   }
   else { # child