FHEM/mod-AMAD
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

übergabe von leere Argumente beim subroutinen aufruf abgefangen, Beim aufruf des MediaPlayer wird ein weiteres Argument device mit übergeben für eine Rückantwort bei Title,Albm,Artist

Browse Source
This commit is contained in:
Marko Oldenburg 2015-08-06 09:27:05 +02:00
parent 1fdbfa18d1
commit d226e623dd
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
74_AMAD.pm
View File

@ -160,22 +160,22 @@ sub AMAD_Set($$@)
if (lc $cmd eq 'screenmsg') { if (lc $cmd eq 'screenmsg') {
Log3 $name, 4, "AMAD ($name) - set $name $cmd ".join(" ", @val); 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') { 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); return AMAD_SetTtsMsg ($hash, @val);
} }
elsif (lc $cmd eq 'volume') { 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); return AMAD_SetVolume ($hash, @val);
} }
elsif (lc $cmd eq 'mediaplayer') { 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); return AMAD_SetMediaplayer ($hash, @val);
} }
elsif (lc $cmd eq 'devicestate') { 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); my $v = join(" ", @val);
readingsSingleUpdate ($hash,$cmd,$v,1); readingsSingleUpdate ($hash,$cmd,$v,1);
@ -183,20 +183,20 @@ sub AMAD_Set($$@)
return undef; return undef;
} }
elsif (lc $cmd eq 'brightness') { 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); return AMAD_SetBrightness ($hash, @val);
} }
elsif (lc $cmd eq 'screen') { 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); return AMAD_SetScreen ($hash, @val);
} }
elsif (lc $cmd eq 'openurl') { 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 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($) sub AMAD_RetrieveAutomagicInfo($)
@ -385,7 +385,7 @@ sub AMAD_SetMediaplayer($@) {
my $btn = join(" ", @data); 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); return AMAD_HTTP_POST ($hash,$url);
} }