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

Compare commits

base: FHEM:testing
Branches Tags
FHEM:dev
FHEM:patch-codereview
FHEM:main
FHEM:testing
..
compare: FHEM:dev
Branches Tags
FHEM:patch-codereview
FHEM:dev
FHEM:main
FHEM:testing

1 Commits
testing ... dev

Author SHA1 Message Date
Marko Oldenburg
89625422f7 fix The behaviour of a "my", "state", or "our" modified with a statement 
modifier conditional or loop construct (for example, "my $x if ...") is
undefined. The value of the "my" variable may be "undef", any previously
assigned value, or possibly anything else. Don't rely on it. Future
versions of perl might do something different from the version of perl you
try it out on. Here be dragons.
 2021-02-28 19:51:13 +01:00
1 changed files with 12 additions and 27 deletions
Show Stats Expand all files Collapse all files

39
21_HEOSPlayer.pm
View File

@ -8,7 +8,6 @@
# Special thanks goes to comitters:
# - Olaf Schnicke Thanks for many many Code
# - Dieter Hehlgans Thanks for Commandref
# - laurello Thanks for variable $aid
#
#
# This script is free software; you can redistribute it and/or modify
@ -84,7 +83,6 @@ sub HEOSPlayer_Initialize($) {
"disable:1 ".
"mute2play:1 ".
"channelring:1 ".
"add2qopt:1,2,3,4 ". #playNow,playNext,addToEnd,replaceAndPlay #lau -->
$readingFnAttributes;
foreach my $d(sort keys %{$modules{HEOSPlayer}{defptr}}) {
@ -605,8 +603,8 @@ sub HEOSPlayer_Set($$@) {
my $mid;
my $cid = $args[0];
my $aid = AttrVal($name, 'add2qopt', 4); #lau -->
my @path = split(",", $args[0]) if ( @args != 0 && $args[0] =~ /,/ );
my @path;
@path = split(",", $args[0]) if ( @args != 0 && $args[0] =~ /,/ );
$cid = $path[0] if ( scalar @path > 0);
$mid = $path[1] if ( scalar @path > 1);
@ -623,15 +621,13 @@ sub HEOSPlayer_Set($$@) {
if ( $cmd eq 'playPlaylist' ) {
$heosCmd = $cmd;
$action = "sid=1025&cid=$cid&aid=$aid"; #lau -->
#$action = "sid=1025&cid=$cid&aid=4"; #lau <--
$action = "sid=1025&cid=$cid&aid=4";
} elsif ( $cmd eq 'playPlaylistItem' ) {
return "usage: playPlaylistItem name,nr" if ( scalar @path < 2);
$heosCmd = 'playPlaylist';
$action = "sid=1025&cid=$cid&mid=$mid&aid=$aid"; #lau -->
#$action = "sid=1025&cid=$cid&mid=$mid&aid=4"; #lau <--
$action = "sid=1025&cid=$cid&mid=$mid&aid=4";
} elsif ( $cmd eq 'deletePlaylist' ) {
@ -661,7 +657,6 @@ sub HEOSPlayer_Set($$@) {
my $param = shift( @args );
my ($sid,$cid,$mid) = split /,/,$param;
my $aid = AttrVal($name, 'add2qopt', 4); #lau -->
return "usage: $cmd sid[,cid][,mid]" unless( defined $sid || $sid eq "" );
if ( $sid eq "1024" ) {
@ -669,20 +664,16 @@ sub HEOSPlayer_Set($$@) {
#Server abspielen
$heosCmd = 'playPlaylist';
$action = "sid=$sid&cid=$cid&aid=$aid"; #lau -->
$action = "sid=$sid&cid=$cid&mid=$mid&aid=$aid" if ( defined($mid) ); #lau -->
#$action = "sid=$sid&cid=$cid&aid=4"; #lau <--
#$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) ); #lau <--
$action = "sid=$sid&cid=$cid&aid=4";
$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) );
} elsif ( $sid eq "1025" ) {
return "usage: $cmd sid,cid[,mid]" unless( defined($cid) );
#Playlist abspielen
$heosCmd = 'playPlaylist';
$action = "sid=$sid&cid=$cid&aid=$aid"; #lau -->
$action = "sid=$sid&cid=$cid&mid=$mid&aid=$aid" if ( defined($mid) ); #lau -->
#$action = "sid=$sid&cid=$cid&aid=4"; #lau <--
#$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) ); #lau <--
$action = "sid=$sid&cid=$cid&aid=4";
$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) );
} elsif ( $sid eq "1026" ) {
return "usage: $cmd sid,cid,mid" unless( defined($cid) );
@ -691,10 +682,8 @@ sub HEOSPlayer_Set($$@) {
if ( $cid eq "TRACKS" ) {
$heosCmd = 'playPlaylist';
$action = "sid=$sid&cid=$cid&aid=$aid"; #lau -->
$action = "sid=$sid&cid=$cid&mid=$mid&aid=$aid" if ( defined($mid) ); #lau -->
#$action = "sid=$sid&cid=$cid&aid=4"; #lau <--
#$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) ); #lau <--
$action = "sid=$sid&cid=$cid&aid=4";
$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) );
} elsif ( $cid eq "STATIONS" ) {
@ -746,10 +735,8 @@ sub HEOSPlayer_Set($$@) {
#Server abspielen
$heosCmd = 'playPlaylist';
$action = "sid=$sid&cid=$cid&aid=$aid"; #lau -->
$action = "sid=$sid&cid=$cid&mid=$mid&aid=$aid" if ( defined($mid) ); #lau -->
#$action = "sid=$sid&cid=$cid&aid=4"; #lau <--
#$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) ); #lau <--
$action = "sid=$sid&cid=$cid&aid=4";
$action = "sid=$sid&cid=$cid&mid=$mid&aid=4" if ( defined($mid) );
}
}
@ -1188,7 +1175,6 @@ sub HEOSPlayer_makeImage($$) {
<ul>
<li>channelring - when reaching the last favorite ChannelUp/Down switches in circle, i.e. to the first/last favorite again</li>
<li>mute2play - if mute switch on speaker is pressed, the stream stops</li>
<li>add2qopt - when adding content to the queue: defines into which position within the queue and if playing is started immediately: 1-play now, 2-play next, 3-only add to end of queue, 4-replace and play (default if not set within the device)</li>
</ul>
</ul>
@ -1285,7 +1271,6 @@ sub HEOSPlayer_makeImage($$) {
<ul>
<li>channelring - Beim Erreichen des letzten Favoriten schaltet ChannelUp/Down im Kreis, also wieder auf den ersten/letzten Favoriten</li>
<li>mute2play - Beim Bet&aumltigen der Mute-Taste am Lautsprecher wird auch der Stream angehalten</li>
<li>add2qopt - Beim Hinzuf&uumlgen von Inhalten in die Warteschlange: definiert an welcher Position innerhalb der Warteschlange hinzugef$uumlgt wird und ob die Wiedergabe sofort gestartet wird: 1-sofort wiedergeben, 2-als n&aumlchstes wiedergeben, 3-nur ans Ende der Warteschlange anh&aumlngen, 4-Warteschlange ersetzen und sofort wiedergeben (Voreinstellung, wenn nicht im device gesetzt)</li>
</ul>
</ul>