summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
30068e6)
This involves fiddling with the `now_playing' function so that it can
find out the current track for itself if necessary.
(Initially I did this on `enable_random' and `enable_play', but that
leads to duplicate now-playing reports because a `playing' notification
will follow unless we never actually stopped playing anything anwyay.
So now we only report on resume.)
else { return "??? multiple lines"; }
}
else { return "??? multiple lines"; }
}
+ if (!defined $track) {
+ my @r = cmd "playing";
+ if ($r[0] =~ /^track\s+(.*)$/) { $track = $1; }
+ else { return; }
+ }
my %p;
for my $p ("artist", "album", "title")
{ $p{$p} = cmd "part", $track, "display", $p; }
my %p;
for my $p ("artist", "album", "title")
{ $p{$p} = cmd "part", $track, "display", $p; }
if ($what eq "state") {
my $st = $f[2];
my $msg;
if ($what eq "state") {
my $st = $f[2];
my $msg;
if ($st eq "disable_random") { $msg = "random play disabled"; }
elsif ($st eq "enable_random") { $msg = "random play enabled"; }
elsif ($st eq "disable_play") { $msg = "playing disabled"; }
elsif ($st eq "enable_play") { $msg = "playing enabled"; }
elsif ($st eq "pause") { $msg = "paused"; }
if ($st eq "disable_random") { $msg = "random play disabled"; }
elsif ($st eq "enable_random") { $msg = "random play enabled"; }
elsif ($st eq "disable_play") { $msg = "playing disabled"; }
elsif ($st eq "enable_play") { $msg = "playing enabled"; }
elsif ($st eq "pause") { $msg = "paused"; }
- elsif ($st eq "resume") { $msg = "playing"; }
+ elsif ($st eq "resume") { $msg = "playing"; $np = 1; }
else { next LINE; }
notify "DisOrder state", ucfirst $msg;
else { next LINE; }
notify "DisOrder state", ucfirst $msg;
}
} elsif ($what eq "playing") {
now_playing $f[2];
}
} elsif ($what eq "playing") {
now_playing $f[2];