Changeset 5dd3058 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:

94a58ce

Parents:

32b323f

git-author:

Alex Dehnert <adehnert@…> (10/10/09 22:35:29)

git-committer:

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

Message:

Actually implement channel configurability

Location:

gutenbach/debian/lib

Files:

• volume-get (modified) (1 diff)
• volume-mute (modified) (1 diff)
• volume-set (modified) (1 diff)

gutenbach/debian/lib/volume-get

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

gutenbach/debian/lib/volume-mute

@@ -5 +5 @@
 queue=$(sipbmp3-get-config queue)
 instance="$queue-volume@$host"
+
+channel=$(sipbmp3-get-config channel)
+
 zwrite -c $class -i $instance -n -m "Toggling mute on $queue"
 
-amixer set Headphone toggle
+amixer set $channel toggle

gutenbach/debian/lib/volume-set

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