From 7621c4f8ce7697ce4da11b1f1bc3848d199597f5 Mon Sep 17 00:00:00 2001
From: Tom van der Lee <t0m.vd.l33@gmail.com>
Date: Mon, 10 Nov 2014 21:35:26 +0100
Subject: Fixed audio and added music player section in panel

---
 herbstluftwm/.config/herbstluftwm/autostart      |  7 ++--
 herbstluftwm/.config/herbstluftwm/dependencylist | 12 +++---
 herbstluftwm/.config/herbstluftwm/panel.sh       | 48 +++++++++++++++++-------
 3 files changed, 45 insertions(+), 22 deletions(-)

(limited to 'herbstluftwm')

diff --git a/herbstluftwm/.config/herbstluftwm/autostart b/herbstluftwm/.config/herbstluftwm/autostart
index edb6361..737fc11 100755
--- a/herbstluftwm/.config/herbstluftwm/autostart
+++ b/herbstluftwm/.config/herbstluftwm/autostart
@@ -48,8 +48,8 @@ hc keybind $Mod-Shift-r reload
 hc keybind $Mod-Shift-c close
 hc keybind $Mod-Return spawn xterm
 hc keybind $Mod-grave spawn dmenu_run $dmenu_opts
-hc keybind XF86AudioLowerVolume spawn amixer -c 2 set Speaker 5%-
-hc keybind XF86AudioRaiseVolume spawn amixer -c 2 set Speaker 5%+
+hc keybind XF86AudioLowerVolume spawn amixer set Master 1%-
+hc keybind XF86AudioRaiseVolume spawn amixer set Master 1%+
 
 echo "env DISPLAY=:0 /usr/bin/dmenu_run $dmenu_opts"
 
@@ -201,10 +201,11 @@ else
 	start_panel $panel
 fi
 
+pulseaudio --start
+
 $hlwm_scripts/start.sh "xautolock -time 5 -locker $hlwm_scripts/lock.sh"
 $hlwm_scripts/start.sh "feh --bg-fill $wallpaper"
 $hlwm_scripts/start.sh "compton --config $HOME/.compton"
 $hlwm_scripts/start.sh "xrdb -load $HOME/.Xresources"
-$hlwm_scripts/start.sh "pulseaudio --start"
 $hlwm_scripts/start.sh "dropboxd"
 $hlwm_scripts/start.sh "$hlwm_scripts/notify.sh $monitor_w $window_p $panel_h $hlwm_scripts/popup.sh"
diff --git a/herbstluftwm/.config/herbstluftwm/dependencylist b/herbstluftwm/.config/herbstluftwm/dependencylist
index a18055d..d8275dd 100644
--- a/herbstluftwm/.config/herbstluftwm/dependencylist
+++ b/herbstluftwm/.config/herbstluftwm/dependencylist
@@ -1,12 +1,14 @@
-compton
+alsa-utils
 bar-aint-recursive
 bc
-wireless_tools
+compton
 dmenu2
 feh
-pulseaudio
-alsa-utils
-sed
 i3lock
+playerctl
+pulseaudio
+pulseaudio-alsa
 scrot
+sed
+wireless_tools
 xautolock
diff --git a/herbstluftwm/.config/herbstluftwm/panel.sh b/herbstluftwm/.config/herbstluftwm/panel.sh
index 588e65e..8a2b0a4 100755
--- a/herbstluftwm/.config/herbstluftwm/panel.sh
+++ b/herbstluftwm/.config/herbstluftwm/panel.sh
@@ -61,21 +61,33 @@ fi
     #   date    ^fg(#efefef)18:33^fg(#909090), 2013-10-^fg(#efefef)29
 
     while true ; do
+		# Music
+		player_status=$(playerctl status)
+		if [ $player_status = "Playing" ]; then
+			player_artist=$(playerctl metadata artist)
+			player_title=$(playerctl metadata title)
+			echo -e "music\tPlaying: $player_title - $player_artist"	
+		else
+			echo -e "music\toff"		
+		fi
+
 		# Volume
-		volumes=$(\
-			amixer get -c 2 get Speaker | \
-			grep "Front Right: Playback"\
-		)
-		vol=$(\
-			echo $volumes | \
-			sed "s/.*\[\([0-9]*\)%\].*/\1/"\
-		)
-		if [ -z $vol ] ; then
+		if pgrep pulseaudio >> /dev/null ; then
+			volumes=$(\
+				amixer get Master | \
+				grep "Front Right: Playback"\
+			)
+			vol=$(\
+				echo $volumes | \
+				sed "s/.*\[\([0-9]*\)%\].*/\1/"\
+			)
+			if [ -z $vol ] ; then
+				echo -e "volume\toff"
+			else
+				echo -e "volume\t%{F$normal_txt}Vol: $vol%%%{F-}"
+			fi
+		else		
 			echo -e "volume\toff"
-		elif [ $vol -le 0 ] ; then
-			echo -e "volume\t%{F$normal_txt}Volume muted"
-		else
-			echo -e "volume\t%{F$normal_txt}Volume: $vol%%%{F-}"
 		fi
 
 		# Network
@@ -154,7 +166,7 @@ fi
         echo -n "%{B-}%{F-} ${windowtitle//^/^^}"
 
 		#Right part of panel
-        right="$volume$net$battery$date "
+        right="$music$volume$net$battery$date "
         echo -n "%{r}$right"
         echo
 
@@ -165,6 +177,14 @@ fi
                 #echo "resetting tags" >&2
                 IFS=$'\t' read -ra tags <<< "$(hc tag_status $monitor)"
                 ;;
+			music)
+				music="${cmd[@]:1}"
+				if [ $music == "off" ] ; then
+					music=""
+				else
+					music="$music $separator%{B-} "
+				fi
+				;;
 			volume)
 				volume="${cmd[@]:1}"
 				if [ $volume == "off" ] ; then
-- 
cgit v1.2.3