Merge pull request #35 from jomo/shairport-patch

Make mpd play nicely with shairport
volumio · Nov 20, 2014 · fdb1e0c · fdb1e0c
2 parents ec4c85f + ecbdfc4
commit fdb1e0c
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/command/player_wrk.php b/command/player_wrk.php
@@ -307,7 +307,8 @@
 // Start Shairport with Volumio name, stopping Mpd on start, with Selected output device
 	playerSession('open',$db);
 	$hostname = $_SESSION['hostname'];	
-	$cmd = '/usr/local/bin/shairport -a "'.$hostname.'" -w -B "mpc stop" -o alsa -- -d plughw:'.$device.' > /dev/null 2>&1 &';
+	$tempfile = '/tmp/.restart_mpd'; // if this file exists, start playing mpd after shairport stopped
+	$cmd = '/usr/local/bin/shairport -a "'.$hostname.'" -w -B "(/usr/bin/mpc | grep -q playing && touch \''.$tempfile.'\'); /usr/bin/mpc stop" -E "test -f \''.$tempfile.'\' && /usr/bin/mpc play && rm -f \''.$tempfile.'\'" -o alsa -- -d plughw:'.$device.' > /dev/null 2>&1 &';
 	sysCmd($cmd);
 }