FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

71_ONKYO_AVR_ZONE.pm: use IOhash for channel validation

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@12262 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2016-10-03 14:15:04 +00:00
parent 33bf150c95
commit 4a37b4eaf2
1 changed files with 15 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
fhem/FHEM/71_ONKYO_AVR_ZONE.pm
View File

@ -582,25 +582,26 @@ sub ONKYO_AVR_ZONE_Set($$$) {
my $channels_src = "internal";
if ( defined( $hash->{helper}{receiver} )
&& ref( $hash->{helper}{receiver} ) eq "HASH"
&& defined( $hash->{helper}{receiver}{device}{netservicelist}{count} )
&& $hash->{helper}{receiver}{device}{netservicelist}{count} > 0 )
&& defined( $IOhash->{helper}{receiver}{device}{netservicelist}{count} )
&& $IOhash->{helper}{receiver}{device}{netservicelist}{count} > 0 )
{
foreach my $id (
sort keys
%{ $hash->{helper}{receiver}{device}{netservicelist}{netservice} } )
%{ $IOhash->{helper}{receiver}{device}{netservicelist}{netservice} }
)
{
if (
defined(
$hash->{helper}{receiver}{device}{netservicelist}
$IOhash->{helper}{receiver}{device}{netservicelist}
{netservice}{$id}{value}
)
&& $hash->{helper}{receiver}{device}{netservicelist}
&& $IOhash->{helper}{receiver}{device}{netservicelist}
{netservice}{$id}{value} eq "1"
)
{
$channels_txt .=
trim( $hash->{helper}{receiver}{device}{netservicelist}
trim( $IOhash->{helper}{receiver}{device}{netservicelist}
{netservice}{$id}{name} )
. ",";
}
@ -780,10 +781,11 @@ sub ONKYO_AVR_ZONE_Set($$$) {
defined( $hash->{helper}{receiver} )
&& ref( $hash->{helper}{receiver} ) eq "HASH"
&& defined(
$hash->{helper}{receiver}{device}{netservicelist}{count}
$IOhash->{helper}{receiver}{device}{netservicelist}
{count}
)
&& $hash->{helper}{receiver}{device}{netservicelist}{count}
> 0
&& $IOhash->{helper}{receiver}{device}{netservicelist}
{count} > 0
)
{
@ -791,19 +793,19 @@ sub ONKYO_AVR_ZONE_Set($$$) {
foreach my $id (
sort keys %{
$hash->{helper}{receiver}{device}{netservicelist}
$IOhash->{helper}{receiver}{device}{netservicelist}
{netservice}
}
)
{
if (
defined(
$hash->{helper}{receiver}{device}
$IOhash->{helper}{receiver}{device}
{netservicelist}{netservice}{$id}{value}
)
&& $hash->{helper}{receiver}{device}
&& $IOhash->{helper}{receiver}{device}
{netservicelist}{netservice}{$id}{value} eq "1"
&& $hash->{helper}{receiver}{device}
&& $IOhash->{helper}{receiver}{device}
{netservicelist}{netservice}{$id}{name} eq
$channelname
)