From: Nick Bowler <draconx@gmail.com>
Date: Sun, 1 Jun 2008 23:42:32 +0000 (-0400)
Subject: Merge branch 'master' of atropos:.fvwm
X-Git-Url: https://git.draconx.ca/gitweb/fvwmconf.git/commitdiff_plain/f0b5b8ca7eb9a95227c5946f5f7dbfce08b8ef73

Merge branch 'master' of atropos:.fvwm

Conflicts:

	scripts/mpdmenu.pl
---

f0b5b8ca7eb9a95227c5946f5f7dbfce08b8ef73
diff --cc scripts/mpdmenu.pl
index 94ec8d5,4639211..ebd4c31
--- a/scripts/mpdmenu.pl
+++ b/scripts/mpdmenu.pl
@@@ -263,43 -263,49 +263,49 @@@ if (defined $album) 
  			$songid = $2 if ($1 eq "songid");
  		}
  	}
- 	die("Failed status query\n") unless (defined $state && defined $songid);
+ 	die("Failed status query\n") unless (defined $state);
  
- 	print $sock "playlistid $songid\n";
- 	while (<$sock>) {
- 		last if (/^OK/);
- 		die($_) if (/^ACK/);
+ 	cmd("AddToMenu $menu Playing Title") if ($state eq "play");
+ 	cmd("AddToMenu $menu Paused Title")  if ($state eq "pause");
+ 	cmd("AddToMenu $menu Stopped Title") if ($state eq "stop");
  
- 		if (/^(\w+): (.*)$/) {
- 			$entry{$1} = $2;
+ 	if (defined $songid) {
+ 		print $sock "playlistid $songid\n";
+ 		while (<$sock>) {
+ 			last if (/^OK/);
+ 			die($_) if (/^ACK/);
+ 
+ 			if (/^(\w+): (.*)$/) {
+ 				$entry{$1} = $2;
+ 			}
  		}
- 	}
- 	die("Failed data query\n") unless (keys(%entry) > 0);
+ 		die("Failed data query\n") unless (keys(%entry) > 0);
  
- 	open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
- 	                         "--image", "--music",  $entry{file};
- 	my $thumb = <THUMB>;
- 	my $scan  = <THUMB>;
- 	close(THUMB);
- 	die("Incompetent use of thumbnail.zsh") if ($?);
 -		open THUMB, "-|", "$FVWM/scripts/thumbnail.sh",
++		open THUMB, "-|", "$FVWM/scripts/thumbnail.zsh",
+ 		                         "--image", "--music",  $entry{file};
+ 		my $thumb = <THUMB>;
+ 		my $scan  = <THUMB>;
+ 		close(THUMB);
+ 		die("Incompetent use of thumbnail.sh") if ($?);
  
- 	$thumb =~ s/\n//sg;
- 	$scan  =~ s/\n//sg;
+ 		$thumb =~ s/\n//sg;
+ 		$scan  =~ s/\n//sg;
  
- 	cmd("AddToMenu $menu Playing Title") if ($state eq "play");
- 	cmd("AddToMenu $menu Paused Title")  if ($state eq "pause");
- 	cmd("AddToMenu $menu Stopped Title") if ($state eq "stop");
- 	if (-f $thumb) {
- 		cmd("AddToMenu $menu \"*$thumb*\" "
- 			."Exec exec gqview ".shellify($scan, 0));
+ 		if (-f $thumb) {
+ 			cmd("AddToMenu $menu \"*$thumb*\" "
+ 				."Exec exec gqview ".shellify($scan, 0));
+ 		}
+ 		cmd("AddToMenu $menu \"Title:	".sanitise($entry{Title})."\" "
+ 			."Popup MenuMPDTitle");
+ 		cmd("AddToMenu $menu \"Artist:	".sanitise($entry{Artist})."\" "
+ 			."Popup MenuMPDArtist");
+ 		cmd("AddToMenu $menu \"Album:	".sanitise($entry{Album})."\" "
+ 			."Popup MenuMPDAlbum");
+ 		cmd("AddToMenu $menu \"\" Nop");
+ 	} else {
+ 		cmd("AddToMenu $menu \"<Song info unavailable>\"");
+ 		cmd("AddToMenu $menu \"\" Nop");
  	}
- 	cmd("AddToMenu $menu \"Title:	".sanitise($entry{Title})."\" "
- 		."Popup MenuMPDTitle");
- 	cmd("AddToMenu $menu \"Artist:	".sanitise($entry{Artist})."\" "
- 		."Popup MenuMPDArtist");
- 	cmd("AddToMenu $menu \"Album:	".sanitise($entry{Album})."\" "
- 		."Popup MenuMPDAlbum");
- 	cmd("AddToMenu $menu \"\" Nop");
  
  	if ($state eq "play" || $state eq "pause") {
  		cmd("AddToMenu $menu \"\t\tNext%$icons/next.svg:16x16%\" "