Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

ENIGMA2: make perl >=5.012 mandatory for now

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk/fhem@4600 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2014-01-10 07:14:17 +00:00
parent 103727aeec
commit 2bc18f133a
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
FHEM/70_ENIGMA2.pm
View File

@ -24,7 +24,7 @@
# along with fhem. If not, see <http://www.gnu.org/licenses/>. # along with fhem. If not, see <http://www.gnu.org/licenses/>.
# #
# #
# Version: 1.2.4 # Version: 1.2.5
# #
# Major Version History: # Major Version History:
# - 1.2.0 - 2013-12-21 # - 1.2.0 - 2013-12-21
@ -41,6 +41,7 @@
package main; package main;
use 5.012;
use strict; use strict;
use warnings; use warnings;
use XML::Simple; use XML::Simple;
@ -205,6 +206,7 @@ sub ENIGMA2_GetStatus($;$) {
) )
{ {
my $i = 0; my $i = 0;
# TODO this loop is >5.012 only
for ( keys @{ $services_list->{e2service} } ) { for ( keys @{ $services_list->{e2service} } ) {
my $channel = my $channel =
$services_list->{e2service}[$_]{e2servicename}; $services_list->{e2service}[$_]{e2servicename};
@ -555,7 +557,8 @@ sub ENIGMA2_GetStatus($;$) {
if ( defined( $currsrvinfo->{e2service}{$e2reading} ) if ( defined( $currsrvinfo->{e2service}{$e2reading} )
&& lc( $currsrvinfo->{e2service}{$e2reading} ) ne "n/a" && lc( $currsrvinfo->{e2service}{$e2reading} ) ne "n/a"
&& lc( $currsrvinfo->{e2service}{$e2reading} ) ne "n/axn/a" ) && lc( $currsrvinfo->{e2service}{$e2reading} ) ne "n/axn/a"
&& lc( $currsrvinfo->{e2service}{$e2reading} ) ne "0x0" )
{ {
if ( $currsrvinfo->{e2service}{$e2reading} eq "False" if ( $currsrvinfo->{e2service}{$e2reading} eq "False"
|| $currsrvinfo->{e2service}{$e2reading} eq "True" ) || $currsrvinfo->{e2service}{$e2reading} eq "True" )
@ -596,12 +599,13 @@ sub ENIGMA2_GetStatus($;$) {
split( /:/, $currsrvinfo->{e2service}{$e2reading} ); split( /:/, $currsrvinfo->{e2service}{$e2reading} );
if ( defined( $servicetype[2] ) if ( defined( $servicetype[2] )
&& $servicetype[2] eq "2" ) && $servicetype[2] eq "2"
&& $hash->{READING}{input}{VAL} ne "radio" )
{ {
$hash->{helper}{lastInput} = "radio"; $hash->{helper}{lastInput} = "radio";
readingsBulkUpdate( $hash, "input", "radio" ); readingsBulkUpdate( $hash, "input", "radio" );
} }
else { elsif ( $hash->{READING}{input}{VAL} ne "tv" ) {
$hash->{helper}{lastInput} = "tv"; $hash->{helper}{lastInput} = "tv";
readingsBulkUpdate( $hash, "input", "tv" ); readingsBulkUpdate( $hash, "input", "tv" );
} }
@ -945,7 +949,7 @@ sub ENIGMA2_Get($@) {
} }
else { else {
return return
"Unknown argument $what, choose one of power:noArg input:noArg volume:noArg mute:noArg channel:noArg currentMedia:noArg currentTitle:noArg serviceprovider:noArg servicevideosize:noArg streamUrl:,mobile "; "Unknown argument $what, choose one of power:noArg input:noArg volume:noArg mute:noArg channel:noArg currentMedia:noArg currentTitle:noArg nextTitle:noArg providername:noArg servicevideosize:noArg streamUrl:,mobile ";
} }
} }