X-Git-Url: https://git.draconx.ca/gitweb/mpdhacks.git/blobdiff_plain/efd378c6eac050f999cad78ade5b4a3946164105..331857cbca2513dafa50bf120e9712f1c2c280d0:/mpdmenu.pl?ds=sidebyside

diff --git a/mpdmenu.pl b/mpdmenu.pl
index 77a293f..963934a 100755
--- a/mpdmenu.pl
+++ b/mpdmenu.pl
@@ -1,4 +1,13 @@
 #!/usr/bin/perl
+#
+# Copyright © 2008,2010,2012,2019 Nick Bowler
+#
+# Silly little script to generate an FVWM menu with various bits of MPD
+# status information and controls.
+#
+# License GPLv3+: GNU General Public License version 3 or any later version.
+# This is free software: you are free to change and redistribute it.
+# There is NO WARRANTY, to the extent permitted by law.
 
 use strict;
 
@@ -12,7 +21,8 @@ use constant {
 };
 
 use utf8;
-use encoding 'utf8';
+use open qw(:std :utf8);
+binmode(STDOUT, ":utf8");
 use Encode;
 
 sub cmd
@@ -49,7 +59,8 @@ $title  = decode_utf8($title)  if defined($title);;
 my $sock = new IO::Socket::INET6(
 	PeerAddr => $host,
 	PeerPort => $port,
-	Proto => 'tcp'
+	Proto => 'tcp',
+	Timeout => 2
 ) or die("could not open socket: $!.\n");
 binmode($sock, ":utf8");
 
@@ -317,25 +328,25 @@ if (defined $album) {
 
 	if ($state eq "play" || $state eq "pause") {
 		cmd("AddToMenu $menu \"\t\tNext%$icons/next.svg:16x16%\" "
-			."Exec exec mpc next");
+			."Exec exec $FVWM/scripts/mpdexec.pl next");
 		cmd("AddToMenu $menu \"\t\tPause%$icons/pause.svg:16x16%\" "
-			."Exec exec mpc pause") if ($state eq "play");
+			."Exec exec $FVWM/scripts/mpdexec.pl pause");
 		cmd("AddToMenu $menu \"\t\tPlay%$icons/play.svg:16x16%\" "
-			."Exec exec mpc play") if ($state eq "pause");
+			."Exec exec $FVWM/scripts/mpdexec.pl play");
 		cmd("AddToMenu $menu \"\t\tStop%$icons/stop.svg:16x16%\" "
-			."Exec exec mpc stop");
+			."Exec exec $FVWM/scripts/mpdexec.pl stop");
 		cmd("AddToMenu $menu \"\t\tPrev%$icons/prev.svg:16x16%\" "
-			."Exec exec mpc prev");
+			."Exec exec $FVWM/scripts/mpdexec.pl previous");
 	} elsif ($state eq "stop") {
 		cmd("AddToMenu $menu \"\t\tPlay%$icons/play.svg:16x16%\" "
-			."Exec exec mpc play");
+			."Exec exec $FVWM/scripts/mpdexec.pl play");
 	} else {
 		die("Unknown MPD state!\n");
 	}
 
 	cmd("AddToMenu $menu \"\" Nop");
 	cmd("AddToMenu $menu \"\t\tShuffle%$icons/shuffle.svg:16x16%\" "
-		."Exec exec mpc shuffle");
+		."Exec exec $FVWM/scripts/mpdexec.pl shuffle");
 
 	cmd("DestroyMenu MenuMPDTitle");
 	cmd("AddToMenu   MenuMPDTitle  DynamicPopUpAction MakeMenuMPDTitle");