Changeset 28836c2 for gutenbach/debian

Timestamp:

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

Author:

Jessica B. Hamrick <jhamrick@…>

Branches:

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

Children:

9f0c46e

Parents:

94a58ce

git-author:

root <root@…> (10/11/09 00:58:04)

git-committer:

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

Message:

Improve configuration and fine-tune zephyrs

Location:

gutenbach/debian/lib

Files:

• sipbmp3-get-config (modified) (2 diffs)
• volume-get (modified) (1 diff)
• volume-mute (modified) (1 diff)
• volume-set (modified) (1 diff)

gutenbach/debian/lib/sipbmp3-get-config

@@ -6 +6 @@
 my $host = `hostname`;
 my $queue = "sipbmp3";
-my $channel = "Headphone";
+my $mixer = "Headphone";
+my $channel = "Front Left";
 
 # Configuration
@@ -22 +23 @@
     'host' => $host,
     'queue' => $queue,
+    'mixer' => $mixer,
     'channel' => $channel,
 );

gutenbach/debian/lib/volume-get

@@ -2 +2 @@
 PATH="$(dirname $0):$PATH"
 
+mixer=$(sipbmp3-get-config mixer)
 channel=$(sipbmp3-get-config channel)
 
-amixer get $channel \
- | perl -lne 'print $1 if (/Front Left: Playback ([0-9]+)/)'
+amixer get $mixer | grep "$channel" \
+ | perl -lne 'print $1 if (/: Playback ([0-9]+)/)'

gutenbach/debian/lib/volume-mute

@@ -6 +6 @@
 instance="$queue-volume@$host"
 
+mixer=$(sipbmp3-get-config mixer)
 channel=$(sipbmp3-get-config channel)
 
-zwrite -c $class -i $instance -d -n -m "Toggling mute on $queue"
+result=$(amixer set $mixer toggle)
+echo "$result"
+volstat=$(echo $result | grep "$channel" \
+ | perl -lne 'print $1 if (/: Playback .*\[(on|off)\]$/)'
+)
 
-amixer set $channel toggle
+zwrite -c $class -i $instance -d -n -m "$REMOTE_USER set volume $volstat" > /dev/null

gutenbach/debian/lib/volume-set

@@ -6 +6 @@
 instance="$queue-volume@$host"
 
-channel=$(sipbmp3-get-config channel)
+mixer=$(sipbmp3-get-config mixer)
+channel="$(sipbmp3-get-config channel)"
 
-amixer set $channel "$2" \
- | perl -lne 'print $1 if (/Front Left: Playback ([0-9]+)/)'
+amixer set $mixer "$2" | grep "$channel" \
+ | perl -lne 'print $1 if (/: Playback ([0-9]+)/)'
 
-zwrite -c $class -i $instance -d -n -m "Setting volume to $(volume-get) on $queue"
+zwrite -c $class -i $instance -d -n -m "$REMOTE_USER set volume to $(volume-get)" > /dev/null