From 6727d0e09439996e980f95295c912f2baebdc121 Mon Sep 17 00:00:00 2001 From: markusbloch Date: Fri, 16 May 2014 19:32:55 +0000 Subject: [PATCH] YAMAHA_AVR: also evaluate Radio_Text_B for currentTitle at input TUNER git-svn-id: https://svn.fhem.de/fhem/trunk@5875 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/71_YAMAHA_AVR.pm | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/71_YAMAHA_AVR.pm b/fhem/FHEM/71_YAMAHA_AVR.pm index 9b221e22a..50ff40da5 100755 --- a/fhem/FHEM/71_YAMAHA_AVR.pm +++ b/fhem/FHEM/71_YAMAHA_AVR.pm @@ -67,6 +67,7 @@ YAMAHA_AVR_GetStatus($;$) my ($hash, $local) = @_; my $name = $hash->{NAME}; my $power; + $local = 0 unless(defined($local)); @@ -217,9 +218,24 @@ YAMAHA_AVR_GetStatus($;$) readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1)); } elsif($infos =~ /.*?(.+?)<\/Radio_Text_A>.*?<\/Meta_Info>/) - { + { + my $tmp = $1; + + if($infos =~ /.*?(.+?)<\/Radio_Text_A>.*?(.+?)<\/Radio_Text_B>.*?<\/Meta_Info>/) + { + readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1." ".$2)); + } + else + { + readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($tmp)); + } + } + elsif($infos =~ /.*?(.+?)<\/Radio_Text_B>.*?<\/Meta_Info>/) + { + readingsBulkUpdate($hash, "currentTitle", YAMAHA_AVR_html2txt($1)); - } + + } else { readingsBulkUpdate($hash, "currentTitle", "", 0);