Changeset 80bbeea

Timestamp:

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

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

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

Children:

a33a064

Parents:

d988d9d

git-author:

Jessica B. Hamrick <jhamrick@…> (12/13/09 00:48:24)

git-committer:

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

Message:

Fixed path to config file, and changed the defaults.

File:

• gutenbach/debian/lib/gutenbach-filter (modified) (10 diffs)

gutenbach/debian/lib/gutenbach-filter

@@ -23 +23 @@
 use IPC::Open2;
 
-my $zephyr_class = "sipb-test";
+my $zephyr_class = `hostname`;
+chomp($zephyr_class);
 my $host = `hostname`;
+chomp($host);
 my $queue = "gutenbach";
 
 # Configuration
-my $config_file = "/usr/lib/gutenbach/gutenbach-filter-config.pl";
+my $config_file = "/usr/lib/gutenbach/config/gutenbach-filter-config.pl";
 if (-r $config_file) {
     # Inline the configuration file
@@ -93 +95 @@
 printf(STDERR Dumper(\%opts));
 
+print(STDERR '/usr/bin/zwrite -d -n -c '.$zephyr_class.' -i '.$queue.'@'.$host.' -s "Gutenbach Music Spooler"');
+
 # Status messages at start of playback
-open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c '. $zephyr_class .' -i ' .
-  $queue.'@'.$host.' -s "SIPB LPR music spooler"');
+open(ZEPHYR, '|/usr/bin/zwrite -d -n -c '.$zephyr_class.' -i '.$queue.'@'.$host.' -s "Gutenbach Music Spooler"');
 
 # For the Now Playing remctl command
 open(STATUS, '>', '/var/run/gutenbach/status') or die("Can't open status file /var/run/gutenbach/status");
 
-# For the Now Playing local command
-open(CURRENT, '>', '/var/run/gutenbach/current') or die("Can't open status file /var/run/sipbp3/current");
 
 print(ZEPHYR "$opts{'n'}\@$opts{'H'} is playing:\n");
 print(STATUS "User: $opts{'n'}\@$opts{'H'}\n");
-print(CURRENT "$opts{'n'}\@$opts{'H'} is playing:\n");
 
 # SIGHUP handler
@@ -112 +112 @@
     open(STA, '>', '/var/run/gutenbach/status');
     close(STA);
-    open(ZEPH, '|/usr/athena/bin/zwrite -d -n -c '. $zephyr_class .' -i '.
-        $queue.'@'.$host.' -s "SIPB LPR music spooler"');
+    open(ZEPH, '|/usr/bin//zwrite -d -n -c '.$zephyr_class.' -i '.$queue.'@'.$host.' -s "Gutenbach Music Spooler"');
     print(ZEPH "Playback aborted.\n");
     close(ZEPH);
-    open(CURRENT, '|/usr/athena/bin/zwrite -d -n -c '. $zephyr_class .' -i '.
-        $queue.'@'.$host.' -s "SIPB LPR music spooler"');
-    close(CURRENT);
     die;
 }
@@ -132 +128 @@
 if ($magic) {
     printf(ZEPHYR "%s file %s\n", $magic, $opts{'J'});
-    printf(CURRENT "%s file %s\n", $magic, $opts{'J'});
     printf(STATUS "Filetype: %s\n", $magic);
     printf(STATUS "Filename: %s\n", $opts{'J'});
     if (exists $fileinfo->{'Title'}) {
         printf(ZEPHYR "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
-        printf(CURRENT "\@b{%s}\n", $fileinfo->{'Title'}) if exists $fileinfo->{'Title'};
         printf(STATUS "Title: %s\n", $fileinfo->{'Title'});
     }
@@ -143 +137 @@
         if (exists $fileinfo->{$key}) {
             printf(ZEPHYR "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
-            printf(CURRENT "%s\n", $fileinfo->{$key}) if exists $fileinfo->{$key};
             printf(STATUS "%s: %s\n", $key, $fileinfo->{$key});
         }
@@ -160 +153 @@
         $title = "";
         print ZEPHYR "YouTube video $filepath\n$title";
-        print CURRENT "YouTube video $filepath\n$title";
         print STATUS "YouTube video $filepath\n$title";
         $filepath = <$out>;
@@ -168 +160 @@
         print STDERR "Resolved external reference to $filepath\n";
         printf(ZEPHYR "%s\n", $filepath);
-        printf(CURRENT "%s\n", $filepath);
         printf(STATUS "External: %s\n", $filepath);
     }
@@ -175 +166 @@
     split_playlist($filepath, \%opts);
     close(ZEPHYR);
-    close(CURRENT);
     close(STATUS);
     exit 0;
@@ -183 +173 @@
 #printf(ZEPHYR "Job priority %s\n", $opts{'C'}) if ($opts{'C'} && ($opts{'C'} ne 'A'));
 close(ZEPHYR);
-close(CURRENT);
 close(STATUS);
 play_mplayer_audio($filepath, \%opts);
@@ -280 +269 @@
 
     # Prepare to write status:
-    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c '.$zephyr_class.' -i ' .
-         $queue.'@'.$host.' -s "SIPB LPR music spooler"');
+    open(ZEPHYR, '|/usr/bin//zwrite -d -n -c '.$zephyr_class.' -i '.$queue.'\@'.$host.' -s "Gutenbach Music Spooler"');
     
     # fork for mpg123