Changeset 3a900ef

Timestamp:

Feb 25, 2009, 11:10:33 PM (16 years ago)

Author:

Edward Z. Yang <edwardzyang@…>

Branches:

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

Children:

b5d15a0

Parents:

40b4488

git-author:

Edward Z. Yang <edwardzyang@…> (02/25/09 18:05:49)

git-committer:

Edward Z. Yang <edwardzyang@…> (02/25/09 23:10:33)

Message:

Rewrite to use a config file for Zephyr.

Signed-off-by: Edward Z. Yang <edwardzyang@…>

Files:

• .gitignore (modified) (1 diff)
• gutenbach/debian/lib/sipbmp3-filter (modified) (3 diffs)

.gitignore

@@ -3 +3 @@
 ksplice*
 voldaemon
+log
+printcap

gutenbach/debian/lib/sipbmp3-filter

@@ -21 +21 @@
 use LWP::UserAgent;
 use Data::Dumper;
+
+my $zephyr_class = "sipb-auto";
+my $host = "zsr";
+
+# Configuration
+my $config_file = "/etc/sipbmp3-filter-config.pl";
+if (-r $config_file) {
+    # Inline the configuration file
+    local $/;
+    my $fh;
+    open $fh, $config_file;
+    eval <$fh>;
+}
 
 my $ua = new LWP::UserAgent;
@@ -79 +92 @@
 
 # Status messages at start of playback
-open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
-  'sipbmp3@zsr -s "SIPB LPR music spooler"');
+open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c '. $zephyr_class .' -i ' .
+  'sipbmp3@'.$host.' -s "SIPB LPR music spooler"');
 print(ZEPHYR "$opts{'n'}\@$opts{'H'} is playing:\n");
 
@@ -208 +221 @@
 
     # Prepare to write status:
-    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c sipb-auto -i ' .
-         'sipbmp3@zsr -s "SIPB LPR music spooler"');
+    open(ZEPHYR, '|/usr/athena/bin/zwrite -d -n -c '.$zephyr_class.' -i ' .
+         'sipbmp3@'.$host.' -s "SIPB LPR music spooler"');
     
     # fork for mpg123