From e84f2d7324567b6e8f5cad487b33e94d37c6e1bc Mon Sep 17 00:00:00 2001 From: Wzut Date: Thu, 26 Jan 2017 20:20:08 +0000 Subject: [PATCH] 73_MPD: fix seekcur for player mopidy git-svn-id: https://svn.fhem.de/fhem/trunk@13247 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/73_MPD.pm | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/fhem/FHEM/73_MPD.pm b/fhem/FHEM/73_MPD.pm index cadef7a7b..5bf68a106 100644 --- a/fhem/FHEM/73_MPD.pm +++ b/fhem/FHEM/73_MPD.pm @@ -590,9 +590,9 @@ sub MPD_Set($@) if ($cmd eq "seekcur") { - if (int($hash->{SUBVERSION}) < 20) + if ((int($hash->{SUBVERSION}) < 20) && (AttrVal($name,"player","mpd") eq "mpd")) { - $ret = "command $cmd needs a MPD version of 0.20.0 or greater !"; + $ret = "command $cmd needs a MPD version of 0.20.0 or greater ! (is ".$hash->{VERSION}.")"; Log3 $name,3,"$name,$ret"; readingsSingleUpdate($hash,"last_error",$ret,1); } @@ -600,9 +600,7 @@ sub MPD_Set($@) { if($subcmd=~/^(?:(?:([01]?\d|2[0-3]):)?([0-5]?\d):)?([0-5]?\d)$/) # Matches valid time given as [[hh:]mm:]ss { - if (defined($1) && defined($2) && defined($3) ) - { $subcmd=$1*3600+$2*60+$3; } # Sekunden ausrechnen - else { $subcmd=0; } + $subcmd=(defined($1) ? $1 : 0)*3600+(defined($2) ? $2 : 0)*60+$3; # Sekunden ausrechnen } else { $subcmd--; $subcmd++; } # sicherstellen das subcmd numerisch ist if ( $subcmd > 0 )