From d226e623dd51b94f647b8b48f0ecfd86657d219d Mon Sep 17 00:00:00 2001 From: Marko Oldenburg Date: Thu, 6 Aug 2015 09:27:05 +0200 Subject: [PATCH] =?UTF-8?q?=C3=BCbergabe=20von=20leere=20Argumente=20beim?= =?UTF-8?q?=20subroutinen=20aufruf=20abgefangen,=20Beim=20aufruf=20des=20M?= =?UTF-8?q?ediaPlayer=20wird=20ein=20weiteres=20Argument=20device=20mit=20?= =?UTF-8?q?=C3=BCbergeben=20f=C3=BCr=20eine=20R=C3=BCckantwort=20bei=20Tit?= =?UTF-8?q?le,Albm,Artist?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- 74_AMAD.pm | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/74_AMAD.pm b/74_AMAD.pm index 88e314c..8f47168 100644 --- a/74_AMAD.pm +++ b/74_AMAD.pm @@ -160,22 +160,22 @@ sub AMAD_Set($$@) if (lc $cmd eq 'screenmsg') { Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); - return AMAD_SetScreenMsg ($hash, @val); + return AMAD_SetScreenMsg ($hash, @val) if (defined(@val)); } elsif (lc $cmd eq 'ttsmsg') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetTtsMsg ($hash, @val); } elsif (lc $cmd eq 'volume') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetVolume ($hash, @val); } elsif (lc $cmd eq 'mediaplayer') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetMediaplayer ($hash, @val); } elsif (lc $cmd eq 'devicestate') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); my $v = join(" ", @val); readingsSingleUpdate ($hash,$cmd,$v,1); @@ -183,20 +183,20 @@ sub AMAD_Set($$@) return undef; } elsif (lc $cmd eq 'brightness') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetBrightness ($hash, @val); } elsif (lc $cmd eq 'screen') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetScreen ($hash, @val); } elsif (lc $cmd eq 'openurl') { - Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); + Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val) if (defined(@val)); return AMAD_SetOpenURL ($hash, @val); } - return "Unknown argument $cmd or wrong parameter(s), choose one of $list"; + return "Unknown argument $cmd, bearword as argument or wrong parameter(s), choose one of $list"; } sub AMAD_RetrieveAutomagicInfo($) @@ -385,7 +385,7 @@ sub AMAD_SetMediaplayer($@) { my $btn = join(" ", @data); - my $url = "http://" . $host . ":" . $port . "/automagic/mediaPlayer?button=$btn"; + my $url = "http://" . $host . ":" . $port . "/automagic/mediaPlayer?button=$btn&device=$name"; return AMAD_HTTP_POST ($hash,$url); }