From 90044a0452c64d599f97a4881678a421f3dd357d Mon Sep 17 00:00:00 2001
From: Florian Fischer <florian.fl.fischer@fau.de>
Date: Mon, 11 Jan 2016 20:54:46 +0100
Subject: rework media_control to work with pulseaudio

1) outsource check if spotify is playing in media_is_spotify_playing.sh
2) use media_is_spotify_playing in media_status.sh
3) rework media_control using media_is_spotify_playing.sh
---
 scripts/media_status.sh | 34 ++--------------------------------
 1 file changed, 2 insertions(+), 32 deletions(-)

(limited to 'scripts/media_status.sh')

diff --git a/scripts/media_status.sh b/scripts/media_status.sh
index 850a0c5..22116e0 100755
--- a/scripts/media_status.sh
+++ b/scripts/media_status.sh
@@ -1,39 +1,9 @@
 #!/bin/bash
-mpd_running=$(mpc | grep "\[playing\]")
+mpd_running=$(mpc 2>/dev/null | grep "\[playing\]")
+spotify_running=$(./media_is_spotify_playing.sh)
 
 if pgrep spotify &>/dev/null
 then
-    if type pacmd &>/dev/null
-    then
-        output=$(pacmd list-sink-inputs)
-        state=""
-        spotify_running=false
-
-        while read -r line; do
-            if [[ $line == *state* ]]
-            then
-                if [[ $line == *RUNNING* ]]
-                then
-                    state="RUNNING" 
-                else
-                    state=""
-                fi
-            fi
-
-            if [[ $line == *application.name* ]]
-            then
-                if [[ $state == "RUNNING" ]] && [[ $line == *Spotify* ]]
-                then
-                    spotify_running=true
-                    break
-                fi
-            fi
-        done <<< "$output"
-    elif lsof | grep /dev/snd | grep spotify &>/dev/null
-    then
-        spotify_running=true
-    fi
-
     if $spotify_running && [[ $mpd_running != "" ]]
     then
         echo spotify and mpd running
-- 
cgit v1.2.3