xmobar - restructure and clean sound/music

config/xmobar/icons/music/pause.xpm

@@ -0,0 +1,21 @@
+/* XPM */
+static char * pause_xpm[] = {
+"16 16 2 1",
+" 	c None",
+".	c #FFFFFF",
+"                ",
+"     ...        ",
+"     .  .       ",
+"      ...       ",
+"        .       ",
+"        .       ",
+"        . .     ",
+"  .. .. .  .    ",
+"  .. .. .  .    ",
+"  .. .. .  .    ",
+"  .. .. . ..    ",
+"  .. .. ...     ",
+"  .. .. ..      ",
+"        .       ",
+"        .       ",
+"                "};

config/xmobar/icons/music/play.xpm

@@ -0,0 +1,21 @@
+/* XPM */
+static char * play_xpm[] = {
+"16 16 2 1",
+" 	c None",
+".	c #FFFFFF",
+"                ",
+"     ...        ",
+"     .  .       ",
+"      ...       ",
+"        .       ",
+"        .       ",
+"   .    . .     ",
+"   ..   .  .    ",
+"   ...  .  .    ",
+"   .... .  .    ",
+"   ...  . ..    ",
+"   ..   ...     ",
+"   .    ..      ",
+"        .       ",
+"        .       ",
+"                "};

config/xmobar/scripts/quodlibet

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+status=$(quodlibet --status | cut -d' ' -f1)
+case "$status" in
+    "playing") icon="<icon=music/play.xpm/>" ;;
+    "paused")  icon="<icon=music/pause.xpm/>"   ;;
+    *) ;;
+esac
+
+echo '<action=`quodlibet --toggle-window`>'"$icon"'</action>'
+

config/xmobar/scripts/sound

@@ -1,17 +1,19 @@
 #!/bin/bash
 
+sound="mute"
+
 if grep -q "\[on\]" <(amixer get Master); then
     current="$(amixer get Master | sed -n '/%/s/.*\[\(.*\)%\].*/\1/p' | head -1)"
     if (( current <= 25 )); then
-        echo "none"
+        sound="none"
     elif (( current <= 50 )); then
-        echo "low"
+        sound="low"
     elif (( current <= 75 )); then
-        echo "medium"
+        sound="medium"
     else
-        echo "high"
+        sound="high"
     fi
-else
-    echo "mute"
 fi
 
+echo "<icon=sound/$sound.xpm/>"
+

local/bin/quodinfo

@@ -1,8 +0,0 @@
-#!/bin/bash
-
-status=$(quodlibet --status | cut -d' ' -f1)
-case "$status" in
-    "playing") quodlibet --print-playing "<title~album>" ;;
-    *) ;;
-esac
-

xmobarrc

@@ -50,9 +50,9 @@ Config { font = "xft:Source Code Pro:size=9"
                         , "--load-icon-patterns", "<icon=cpu/%%.xpm/>"
                         , "--load-icon-patterns", "<icon=cpu4/%%.xpm/>"
                         ] 50
-                    , Run Com "quodinfo" [] "quodlibet" 10
-                    , Run Com "soundinfo" [] "sound" 10
+                    , Run Com ".config/xmobar/scripts/quodlibet" [] "quodlibet" 10
+                    , Run Com ".config/xmobar/scripts/sound" [] "sound" 10
                     , Run StdinReader
                     ]
-       , template = " %StdinReader%} %date% {<action=`quodlibet --toggle-window`>%quodlibet%</action>   %multicpu%<icon=sound/%sound%.xpm/>%wlp7s0wi%%enp9s0%%bright%%battery% "
+       , template = " %StdinReader%} %date% {%multicpu%%quodlibet%%sound%%wlp7s0wi%%enp9s0%%bright%%battery% "
        }