X-Git-Url: https://git.draconx.ca/gitweb/mpdhacks.git/blobdiff_plain/5657bb1ca0815712d16dd4a9cb993e40d08cecf2..7a5fbaef8641be2a1af30c98e50e8baee94171e7:/mpdmenu.pl

diff --git a/mpdmenu.pl b/mpdmenu.pl
index eab65f0..ba1a467 100755
--- a/mpdmenu.pl
+++ b/mpdmenu.pl
@@ -104,7 +104,8 @@ if (defined $album) {
 		$t_title  = sanitise($t_title, 0);
 
 		my $cmd = sprintf "AddToMenu $menu \"%d\t%s - %s\""
-		                  ." Exec mpc playid %d",
+		                  ." Exec exec $FVWM/scripts/mpdexec.pl"
+				  ." playid %d",
 		                  $t_trackno, $t_artist, $t_title, $t_id;
 
 		cmd($cmd);
@@ -200,6 +201,9 @@ if (defined $album) {
 	s/\s+(instrumental|off vocal|short|tv)([\s-]+(mix|size|version))?$//i;
 	s/\s+without\s+\w+$//i;
 
+	# Deal with separate movements in classical pieces.
+	s/: [IVX]+\..*//;
+
 	my $basetitle  = $_;
 	my $_basetitle = $basetitle;
 
@@ -245,7 +249,9 @@ if (defined $album) {
 		$thumb =~ s/\n//sg;
 		$thumb = "%$thumb%" if (-f $thumb);
 
-		cmd("AddToMenu $menu \"$thumb$t_artist - $t_title\" Exec mpc playid $t_id");
+		cmd("AddToMenu $menu \"$thumb$t_artist - $t_title\""
+		    ." Exec exec $FVWM/scripts/mpdexec.pl"
+		    ." playid $t_id");
 	}
 } # end use locale workaround
 } else {
@@ -295,7 +301,7 @@ if (defined $album) {
 
 		if (-f $thumb) {
 			cmd("AddToMenu $menu \"*$thumb*\" "
-				."Exec exec gqview ".shellify($scan, 0));
+				."Exec exec geeqie ".shellify($scan, 0));
 		}
 		cmd("AddToMenu $menu \"Title:	".sanitise($entry{Title}, 0)
 			."\" Popup MenuMPDTitle");
@@ -311,25 +317,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");