From e54d5ed32c76114ba895319d5e2fa2f9fb0b1b34 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Sun, 18 Jan 2015 23:16:44 -0500
Subject: use pactl instead of amixer for volume stuff

since i've already decided to convert to pulseaudio anyway
---
 bin/volume  | 20 ++++++++++----------
 xbindkeysrc |  2 +-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/bin/volume b/bin/volume
index 2bbc857..7b3ff68 100755
--- a/bin/volume
+++ b/bin/volume
@@ -1,23 +1,23 @@
-#!/bin/sh
+#!/bin/bash
 
 case $1 in
     up)
-        amixer set Master unmute > /dev/null
-        amixer set Master 5%+ > /dev/null
+        pactl set-sink-mute 1 0
+        pactl set-sink-volume 1 -- +5%
         ;;
     down)
-        amixer set Master unmute > /dev/null
-        amixer set Master 5%- > /dev/null
+        pactl set-sink-mute 1 0
+        pactl set-sink-volume 1 -- -5%
         ;;
     mute)
-        amixer set Master toggle > /dev/null
+        pactl set-sink-mute 1 toggle
         ;;
 esac
 
-INFO=$(amixer get Master)
-VOLUME=$(echo "$INFO" | grep '^  Front Left' | sed 's/.*\[\([[:digit:]]\+\)\%\].*/\1/')
-STATE=$(echo "$INFO" | grep '^  Front Left' | sed 's/.*\[\(on\|off\)\].*/\1/')
-if [[ "x$STATE" == "xoff" ]]; then
+INFO=$(pacmd dump | grep analog-stereo)
+VOLUME=$(echo "$INFO" | grep 'set-sink-volume' | cut -d' ' -f 3 | perl -e'print 100*oct(<>)/0x10000')
+STATE=$(echo "$INFO" | grep 'set-sink-mute' | cut -d' ' -f 3)
+if [[ "x$STATE" == "xyes" ]]; then
     volnoti-show -m
 else
     volnoti-show $VOLUME
diff --git a/xbindkeysrc b/xbindkeysrc
index fc30241..8fdbb96 100644
--- a/xbindkeysrc
+++ b/xbindkeysrc
@@ -37,7 +37,7 @@
 "volume mute"
   XF86AudioMute
 
-"amixer set Capture toggle"
+"pactl set-source-mute 2 toggle"
   XF86AudioMicMute
 
 "xrandr --auto"
-- 
cgit v1.2.3-54-g00ecf