add Groupsupport
This commit is contained in:
Marko Oldenburg
parent
ce192034cd
commit
f2f83507a2
528
21_HEOSGroup.pm
Normal file
528
21_HEOSGroup.pm
Normal file
@ -0,0 +1,528 @@
|
||||
###############################################################################
|
||||
#
|
||||
# Developed with Kate
|
||||
#
|
||||
# (c) 2017 Copyright: Marko Oldenburg (leongaultier at gmail dot com)
|
||||
# All rights reserved
|
||||
#
|
||||
# This script is free software; you can redistribute it and/or modify
|
||||
# it under the terms of the GNU General Public License as published by
|
||||
# the Free Software Foundation; either version 2 of the License, or
|
||||
# any later version.
|
||||
#
|
||||
# The GNU General Public License can be found at
|
||||
# http://www.gnu.org/copyleft/gpl.html.
|
||||
# A copy is found in the textfile GPL.txt and important notices to the license
|
||||
# from the author is found in LICENSE.txt distributed with these scripts.
|
||||
#
|
||||
# This script is distributed in the hope that it will be useful,
|
||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
# GNU General Public License for more details.
|
||||
#
|
||||
#
|
||||
# $Id$
|
||||
#
|
||||
###############################################################################
|
||||
|
||||
|
||||
package main;
|
||||
|
||||
use strict;
|
||||
use warnings;
|
||||
use JSON qw(decode_json);
|
||||
use Encode qw(encode_utf8);
|
||||
|
||||
|
||||
my $version = "0.1.47";
|
||||
|
||||
|
||||
|
||||
|
||||
# Declare functions
|
||||
sub HEOSGroup_Initialize($);
|
||||
sub HEOSGroup_Define($$);
|
||||
sub HEOSGroup_Undef($$);
|
||||
sub HEOSGroup_Attr(@);
|
||||
sub HEOSGroup_Parse($$);
|
||||
sub HEOSGroup_WriteReadings($$);
|
||||
sub HEOSGroup_Set($$@);
|
||||
sub HEOSGroup_PreProcessingReadings($$);
|
||||
sub HEOSGroup_GetGroupInfo($);
|
||||
sub HEOSGroup_GetGroupVolume($);
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
sub HEOSGroup_Initialize($) {
|
||||
|
||||
my ($hash) = @_;
|
||||
|
||||
$hash->{Match} = '.*{"command":."group.*|.*{"command":."event/group.*';
|
||||
|
||||
# Provider
|
||||
$hash->{SetFn} = "HEOSGroup_Set";
|
||||
$hash->{DefFn} = "HEOSGroup_Define";
|
||||
$hash->{UndefFn} = "HEOSGroup_Undef";
|
||||
$hash->{AttrFn} = "HEOSGroup_Attr";
|
||||
$hash->{ParseFn} = "HEOSGroup_Parse";
|
||||
|
||||
$hash->{AttrList} = "IODev ".
|
||||
"disable:1 ".
|
||||
"mute2play:1 ".
|
||||
$readingFnAttributes;
|
||||
|
||||
|
||||
|
||||
foreach my $d(sort keys %{$modules{HEOSGroup}{defptr}}) {
|
||||
my $hash = $modules{HEOSGroup}{defptr}{$d};
|
||||
$hash->{VERSION} = $version;
|
||||
}
|
||||
}
|
||||
|
||||
sub HEOSGroup_Define($$) {
|
||||
|
||||
my ( $hash, $def ) = @_;
|
||||
|
||||
my @a = split( "[ \t]+", $def );
|
||||
splice( @a, 1, 1 );
|
||||
my $iodev;
|
||||
my $i = 0;
|
||||
|
||||
foreach my $param ( @a ) {
|
||||
if( $param =~ m/IODev=([^\s]*)/ ) {
|
||||
$iodev = $1;
|
||||
splice( @a, $i, 3 );
|
||||
last;
|
||||
}
|
||||
|
||||
$i++;
|
||||
}
|
||||
|
||||
return "too few parameters: define <name> HEOSGroup <gid>" if( @a < 2 );
|
||||
|
||||
my ($name,$gid) = @a;
|
||||
|
||||
$hash->{GID} = $gid;
|
||||
$hash->{VERSION} = $version;
|
||||
|
||||
|
||||
AssignIoPort($hash,$iodev) if( !$hash->{IODev} );
|
||||
|
||||
if(defined($hash->{IODev}->{NAME})) {
|
||||
|
||||
Log3 $name, 3, "HEOSGroup ($name) - I/O device is " . $hash->{IODev}->{NAME};
|
||||
} else {
|
||||
|
||||
Log3 $name, 1, "HEOSGroup ($name) - no I/O device";
|
||||
}
|
||||
|
||||
$iodev = $hash->{IODev}->{NAME};
|
||||
|
||||
|
||||
my $code = abs($gid);
|
||||
$code = $iodev."-".$code if( defined($iodev) );
|
||||
my $d = $modules{HEOSGroup}{defptr}{$code};
|
||||
return "HEOSGroup device $hash->{GID} on HEOSMaster $iodev already defined as $d->{NAME}."
|
||||
if( defined($d)
|
||||
&& $d->{IODev} == $hash->{IODev}
|
||||
&& $d->{NAME} ne $name );
|
||||
|
||||
|
||||
Log3 $name, 3, "HEOSGroup ($name) - defined with Code: $code";
|
||||
|
||||
$attr{$name}{room} = "HEOS" if( !defined( $attr{$name}{room} ) );
|
||||
$attr{$name}{devStateIcon} = "on:10px-kreis-gruen off:10px-kreis-rot" if( !defined( $attr{$name}{devStateIcon} ) );
|
||||
|
||||
|
||||
#if( $init_done ) {
|
||||
# InternalTimer( gettimeofday()+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
||||
# InternalTimer( gettimeofday()+int(rand(4)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
||||
#} else {
|
||||
# InternalTimer( gettimeofday()+15+int(rand(2)), "HEOSGroup_GetGroupInfo", $hash, 0 );
|
||||
# InternalTimer( gettimeofday()+15+int(rand(10)), "HEOSGroup_GetGroupVolume", $hash, 0 );
|
||||
#}
|
||||
|
||||
readingsBeginUpdate($hash);
|
||||
readingsBulkUpdate($hash, 'state','Initialized');
|
||||
readingsBulkUpdate($hash, 'volumeUp', 5);
|
||||
readingsBulkUpdate($hash, 'volumeDown', 5);
|
||||
readingsEndUpdate($hash, 1);
|
||||
|
||||
|
||||
$modules{HEOSGroup}{defptr}{$code} = $hash;
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub HEOSGroup_Undef($$) {
|
||||
|
||||
my ( $hash, $arg ) = @_;
|
||||
|
||||
my $gid = $hash->{GID};
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
RemoveInternalTimer($hash);
|
||||
|
||||
my $code = abs($gid);
|
||||
$code = $hash->{IODev}->{NAME} ."-". $code if( defined($hash->{IODev}->{NAME}) );
|
||||
delete($modules{HEOSGroup}{defptr}{$code});
|
||||
|
||||
Log3 $name, 3, "HEOSGroup ($name) - device $name deleted with Code: $code";
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub HEOSGroup_Attr(@) {
|
||||
|
||||
my ( $cmd, $name, $attrName, $attrVal ) = @_;
|
||||
my $hash = $defs{$name};
|
||||
my $token = $hash->{IODev}->{TOKEN};
|
||||
|
||||
if( $attrName eq "disable" ) {
|
||||
if( $cmd eq "set" and $attrVal eq "1" ) {
|
||||
readingsSingleUpdate ( $hash, "state", "disabled", 1 );
|
||||
Log3 $name, 3, "HEOSGroup ($name) - disabled";
|
||||
}
|
||||
|
||||
elsif( $cmd eq "del" ) {
|
||||
readingsSingleUpdate ( $hash, "state", "active", 1 );
|
||||
Log3 $name, 3, "HEOSGroup ($name) - enabled";
|
||||
}
|
||||
}
|
||||
|
||||
if( $attrName eq "disabledForIntervals" ) {
|
||||
if( $cmd eq "set" ) {
|
||||
Log3 $name, 3, "HEOSGroup ($name) - enable disabledForIntervals";
|
||||
readingsSingleUpdate ( $hash, "state", "Unknown", 1 );
|
||||
}
|
||||
|
||||
elsif( $cmd eq "del" ) {
|
||||
readingsSingleUpdate ( $hash, "state", "active", 1 );
|
||||
Log3 $name, 3, "HEOSGroup ($name) - delete disabledForIntervals";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub HEOSGroup_Set($$@) {
|
||||
|
||||
my ($hash, $name, @aa) = @_;
|
||||
my ($cmd, @args) = @aa;
|
||||
|
||||
my $gid = $hash->{GID};
|
||||
my $action;
|
||||
my $heosCmd;
|
||||
my $rvalue;
|
||||
my $string = "gid=$gid";
|
||||
|
||||
|
||||
if( $cmd eq 'getGroupInfo' ) {
|
||||
return "usage: getGroupInfo" if( @args != 0 );
|
||||
|
||||
$heosCmd = $cmd;
|
||||
|
||||
} elsif( $cmd eq 'mute' ) {
|
||||
return "usage: mute on/off" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'setMute';
|
||||
$action = "state=$args[0]";
|
||||
|
||||
} elsif( $cmd eq 'volume' ) {
|
||||
return "usage: volume 0-100" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'setGroupVolume';
|
||||
$action = "level=$args[0]";
|
||||
|
||||
} elsif( $cmd eq 'volumeUp' ) {
|
||||
return "usage: volumeUp 0-10" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'GroupVolumeUp';
|
||||
$action = "step=$args[0]";
|
||||
|
||||
} elsif( $cmd eq 'volumeDown' ) {
|
||||
return "usage: volumeDown 0-10" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'groupVolumeDown';
|
||||
$action = "step=$args[0]";
|
||||
|
||||
} else {
|
||||
my $list = "getGroupInfo:noArg mute:on,off volume:slider,0,5,100 volumeUp:slider,0,1,10 volumeDown:slider,0,1,10";
|
||||
return "Unknown argument $cmd, choose one of $list";
|
||||
}
|
||||
|
||||
|
||||
$string .= "&$action" if( defined($action));
|
||||
|
||||
IOWrite($hash,"$heosCmd","$string");
|
||||
Log3 $name, 4, "HEOSGroup ($name) - IOWrite: $heosCmd $string IODevHash=$hash->{IODev}";
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
sub HEOSGroup_Parse($$) {
|
||||
|
||||
my ($io_hash,$json) = @_;
|
||||
my $name = $io_hash->{NAME};
|
||||
my $gid;
|
||||
my $decode_json;
|
||||
|
||||
|
||||
$decode_json = decode_json(encode_utf8($json));
|
||||
|
||||
Log3 $name, 4, "HEOSGroup ($name) - ParseFn wurde aufgerufen";
|
||||
|
||||
|
||||
|
||||
|
||||
if( defined($decode_json->{gid}) ) {
|
||||
|
||||
$gid = $decode_json->{gid};
|
||||
my $code = abs($gid);
|
||||
$code = $io_hash->{NAME} ."-". $code if( defined($io_hash->{NAME}) );
|
||||
|
||||
|
||||
if( my $hash = $modules{HEOSGroup}{defptr}{$code} ) {
|
||||
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
#IOWrite($hash,'getPlayerInfo',"gid=$hash->{GID}");
|
||||
#IOWrite($hash,'getPlayState',"gid=$hash->{GID}"); Erst mal schauen ob es ohne das geht, wenn nicht wieder aktivieren
|
||||
#IOWrite($hash,'getNowPlayingMedia',"gid=$hash->{GID}");
|
||||
|
||||
Log3 $name, 4, "HEOSGroup ($name) - find logical device: $hash->{NAME}";
|
||||
Log3 $name, 5, "HEOSGroup ($name) - gid direkt im root von decode_json gefunden";
|
||||
|
||||
return $hash->{NAME};
|
||||
|
||||
} else {
|
||||
|
||||
my $devname = "HEOSGroup".abs($gid);
|
||||
return "UNDEFINED $devname HEOSGroup $gid IODev=$name";
|
||||
}
|
||||
|
||||
} else {
|
||||
|
||||
#return Log3 $name, 3, "result not success"
|
||||
#unless($decode_json->{heos}{result} eq "success"); # Klappt bei Events nicht!! Lieber Fehlermeldung im Reading
|
||||
|
||||
|
||||
if( defined($decode_json->{payload}{gid}) ) {
|
||||
$gid = $decode_json->{payload}{gid};
|
||||
|
||||
} elsif ( $decode_json->{heos}{message} =~ /^gid=/ ) {
|
||||
|
||||
my @gid = split('&', $decode_json->{heos}{message});
|
||||
$gid = substr($gid[0],4);
|
||||
Log3 $name, 4, "HEOSGroup ($name) - gid[0]: $gid[0] and gid: $gid";
|
||||
|
||||
}
|
||||
|
||||
|
||||
my $code = abs($gid);
|
||||
$code = $io_hash->{NAME} ."-". $code if( defined($io_hash->{NAME}) );
|
||||
|
||||
if( my $hash = $modules{HEOSGroup}{defptr}{$code} ) {
|
||||
my $name = $hash->{NAME};
|
||||
HEOSGroup_WriteReadings($hash,$decode_json);
|
||||
Log3 $name, 4, "HEOSGroup ($name) - find logical device: $hash->{NAME}";
|
||||
|
||||
return $hash->{NAME};
|
||||
|
||||
} else {
|
||||
|
||||
my $devname = "HEOSGroup".abs($gid);
|
||||
return "UNDEFINED $devname HEOSGroup $gid IODev=$name";
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
sub HEOSGroup_WriteReadings($$) {
|
||||
|
||||
my ($hash,$decode_json) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
Log3 $name, 3, "HEOSGroup ($name) - processing data to write readings";
|
||||
|
||||
|
||||
|
||||
|
||||
############################
|
||||
#### Aufbereiten der Daten soweit nötig (bei Events zum Beispiel)
|
||||
|
||||
my $readingsHash = HEOSGroup_PreProcessingReadings($hash,$decode_json)
|
||||
if( $decode_json->{heos}{message} =~ /^gid=/ );
|
||||
|
||||
|
||||
############################
|
||||
#### schreiben der Readings
|
||||
|
||||
readingsBeginUpdate($hash);
|
||||
|
||||
### Event Readings
|
||||
if( ref($readingsHash) eq "HASH" ) {
|
||||
|
||||
Log3 $name, 4, "HEOSGroup ($name) - response json Hash back from HEOSGroup_PreProcessingReadings";
|
||||
|
||||
my $t;
|
||||
my $v;
|
||||
while( ( $t, $v ) = each (%{$readingsHash}) ) {
|
||||
if( defined( $v ) ) {
|
||||
|
||||
readingsBulkUpdate( $hash, $t, $v );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
### PlayerInfos
|
||||
readingsBulkUpdate( $hash, 'name', $decode_json->{payload}{name} );
|
||||
readingsBulkUpdate( $hash, 'gid', $decode_json->{payload}{gid} );
|
||||
readingsBulkUpdate( $hash, 'model', $decode_json->{payload}{model} );
|
||||
readingsBulkUpdate( $hash, 'version', $decode_json->{payload}{version} );
|
||||
readingsBulkUpdate( $hash, 'network', $decode_json->{payload}{network} );
|
||||
readingsBulkUpdate( $hash, 'lineout', $decode_json->{payload}{lineout} );
|
||||
readingsBulkUpdate( $hash, 'control', $decode_json->{payload}{control} );
|
||||
readingsBulkUpdate( $hash, 'ip-address', $decode_json->{payload}{ip} );
|
||||
|
||||
### playing Infos
|
||||
readingsBulkUpdate( $hash, 'currentMedia', $decode_json->{payload}{type} );
|
||||
readingsBulkUpdate( $hash, 'currentTitle', $decode_json->{payload}{song} );
|
||||
readingsBulkUpdate( $hash, 'currentAlbum', $decode_json->{payload}{album} );
|
||||
readingsBulkUpdate( $hash, 'currentArtist', $decode_json->{payload}{artist} );
|
||||
readingsBulkUpdate( $hash, 'currentImageUrl', $decode_json->{payload}{image_url} );
|
||||
readingsBulkUpdate( $hash, 'currentMid', $decode_json->{payload}{mid} );
|
||||
readingsBulkUpdate( $hash, 'currentQid', $decode_json->{payload}{qid} );
|
||||
readingsBulkUpdate( $hash, 'currentSid', $decode_json->{payload}{sid} );
|
||||
readingsBulkUpdate( $hash, 'currentStation', $decode_json->{payload}{station} );
|
||||
|
||||
|
||||
readingsBulkUpdate( $hash, 'state', 'on' );
|
||||
readingsEndUpdate( $hash, 1 );
|
||||
|
||||
Log3 $name, 5, "HEOSGroup ($name) - readings set for $name";
|
||||
return undef;
|
||||
}
|
||||
|
||||
|
||||
###############
|
||||
### my little Helpers
|
||||
|
||||
sub HEOSGroup_PreProcessingReadings($$) {
|
||||
|
||||
my ($hash,$decode_json) = @_;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
my $reading;
|
||||
my %buffer;
|
||||
|
||||
|
||||
Log3 $name, 4, "HEOSGroup ($name) - preprocessing readings";
|
||||
|
||||
if ( $decode_json->{heos}{command} =~ /play_state/ or $decode_json->{heos}{command} =~ /player_state_changed/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'playStatus'} = substr($value[1],6);
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /volume_changed/ or $decode_json->{heos}{command} =~ /set_volume/ or $decode_json->{heos}{command} =~ /get_volume/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'volume'} = substr($value[1],6);
|
||||
$buffer{'mute'} = substr($value[2],5) if( $decode_json->{heos}{command} =~ /volume_changed/ );
|
||||
|
||||
if (defined($buffer{'mute'}) && AttrVal($name, 'mute2play', 0) == 1) {
|
||||
|
||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=play") if $buffer{'mute'} eq "off";
|
||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=stop") if $buffer{'mute'} eq "on";
|
||||
}
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /play_mode/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
if(substr($value[1],7) eq 'on_all') {
|
||||
|
||||
$buffer{'repeat'} = 'all';
|
||||
|
||||
} elsif (substr($value[1],7) eq 'on_one') {
|
||||
|
||||
$buffer{'repeat'} = 'one';
|
||||
|
||||
} else {
|
||||
|
||||
$buffer{'repeat'} = substr($value[1],7);
|
||||
}
|
||||
|
||||
$buffer{'shuffle'} = substr($value[2],8);
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /volume_up/ or $decode_json->{heos}{command} =~ /volume_down/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'volumeUp'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_up/ );
|
||||
$buffer{'volumeDown'} = substr($value[1],5) if( $decode_json->{heos}{command} =~ /volume_down/ );
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /repeat_mode_changed/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
|
||||
if(substr($value[1],7) eq 'on_all') {
|
||||
|
||||
$buffer{'repeat'} = 'all';
|
||||
|
||||
} elsif (substr($value[1],7) eq 'on_one') {
|
||||
|
||||
$buffer{'repeat'} = 'one';
|
||||
|
||||
} else {
|
||||
|
||||
$buffer{'repeat'} = substr($value[1],7);
|
||||
}
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /shuffle_mode_changed/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'shuffle'} = substr($value[1],8);
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /player_now_playing_changed/ ) {
|
||||
|
||||
IOWrite($hash,'getNowPlayingMedia',"gid=$hash->{GID}");
|
||||
|
||||
} else {
|
||||
|
||||
Log3 $name, 3, "HEOSGroup ($name) - no match found";
|
||||
return undef;
|
||||
}
|
||||
|
||||
|
||||
Log3 $name, 4, "HEOSGroup ($name) - Match found for decode_json";
|
||||
return \%buffer;
|
||||
}
|
||||
|
||||
sub HEOSGroup_GetGroupInfo($) {
|
||||
|
||||
my $hash = shift;
|
||||
|
||||
RemoveInternalTimer($hash,'HEOSGroup_GetGroupInfo');
|
||||
IOWrite($hash,'getGroupInfo',"gid=$hash->{GID}");
|
||||
|
||||
}
|
||||
|
||||
sub HEOSGroup_GetGroupVolume($) {
|
||||
|
||||
my $hash = shift;
|
||||
|
||||
RemoveInternalTimer($hash,'HEOSGroup_GetGroupVolume');
|
||||
IOWrite($hash,'getGroupVolume',"gid=$hash->{GID}");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
1;
|
||||
@ -46,7 +46,7 @@ use Encode qw(encode_utf8);
|
||||
use Net::Telnet;
|
||||
|
||||
|
||||
my $version = "0.1.45";
|
||||
my $version = "0.1.47";
|
||||
|
||||
|
||||
my %heosCmds = (
|
||||
@ -56,17 +56,23 @@ my %heosCmds = (
|
||||
'signAccountOut' => 'system/sign_out',
|
||||
'reboot' => 'system/reboot',
|
||||
'getPlayers' => 'player/get_players',
|
||||
'getGroups' => 'player/get_groups',
|
||||
'getPlayerInfo' => 'player/get_player_info?',
|
||||
'getPlayState' => 'player/get_play_state?',
|
||||
'getPlayMode' => 'player/get_play_mode?',
|
||||
'getVolume' => 'player/get_volume?',
|
||||
'getGroupVolume' => 'group/get_volume?',
|
||||
'setPlayState' => 'player/set_play_state?',
|
||||
'setPlayMode' => 'player/set_play_mode?',
|
||||
'setMute' => 'player/set_mute?',
|
||||
'setVolume' => 'player/set_volume?',
|
||||
'setGroupVolume' => 'group/set_volume?',
|
||||
'volumeUp' => 'player/volume_up?',
|
||||
'volumeDown' => 'player/volume_down?',
|
||||
'GroupVolumeUp' => 'group/volume_up?',
|
||||
'GroupVolumeDown' => 'group/volume_down?',
|
||||
'getNowPlayingMedia' => 'player/get_now_playing_media?',
|
||||
'eventChangeVolume' => 'event/player_volume_changed'
|
||||
'eventChangeVolume' => 'event/player_volume_changed'
|
||||
);
|
||||
|
||||
|
||||
@ -90,6 +96,9 @@ sub HEOSMaster_GetPlayers($);
|
||||
sub HEOSMaster_EnableChangeEvents($);
|
||||
sub HEOSMaster_PreProcessingReadings($$);
|
||||
sub HEOSMaster_ReOpen($);
|
||||
sub HEOSMaster_ReadPassword($);
|
||||
sub HEOSMaster_StorePassword($$);
|
||||
sub HEOSMaster_GetGroups($);
|
||||
|
||||
|
||||
|
||||
@ -99,10 +108,12 @@ sub HEOSMaster_Initialize($) {
|
||||
my ($hash) = @_;
|
||||
|
||||
# Provider
|
||||
$hash->{ReadFn} = "HEOSMaster_Read";
|
||||
$hash->{WriteFn} = "HEOSMaster_Write";
|
||||
$hash->{Clients} = ":HEOSPlayer:";
|
||||
$hash->{MatchList} = { "1:HEOSPlayer" => '.*{"command":."player.*|.*{"command":."event\/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*' };
|
||||
$hash->{ReadFn} = "HEOSMaster_Read";
|
||||
$hash->{WriteFn} = "HEOSMaster_Write";
|
||||
$hash->{Clients} = ":HEOSPlayer:";
|
||||
$hash->{MatchList} = { "1:HEOSPlayer" => '.*{"command":."player.*|.*{"command":."event\/player.*|.*{"command":."event\/repeat_mode_changed.*|.*{"command":."event\/shuffle_mode_changed.*',
|
||||
"2:HEOSGroup" => '.*{"command":."group.*|.*{"command":."event\/group.*'
|
||||
};
|
||||
|
||||
|
||||
# Consumer
|
||||
@ -159,6 +170,8 @@ sub HEOSMaster_Define($$) {
|
||||
InternalTimer( gettimeofday()+15, 'HEOSMaster_firstRun', $hash, 0 ) if( ($hash->{HOST}) );
|
||||
}
|
||||
|
||||
$modules{HEOSPlayer}{defptr}{$host} = $hash;
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
@ -233,6 +246,12 @@ sub HEOSMaster_Set($@) {
|
||||
$heosCmd = 'getPlayers';
|
||||
$action = undef;
|
||||
|
||||
} elsif($cmd eq 'getGroups') {
|
||||
return "usage: getGroups" if( @args != 0 );
|
||||
|
||||
$heosCmd = 'getGroups';
|
||||
$action = undef;
|
||||
|
||||
} elsif($cmd eq 'enableChangeEvents') {
|
||||
return "usage: enableChangeEvents" if( @args != 1 );
|
||||
|
||||
@ -247,9 +266,10 @@ sub HEOSMaster_Set($@) {
|
||||
|
||||
} elsif($cmd eq 'signAccount') {
|
||||
return "usage: signAccountIn" if( @args != 1 );
|
||||
return "please set account informattion first" if(AttrVal($name,'heosUsername','none') eq 'none');
|
||||
|
||||
$heosCmd = $cmd . $args[0];
|
||||
$action = 'un='. AttrVal($name,'heosUsername',0) . '&pw=' . HEOSMaster_ReadPassword($hash) if($args[0] eq 'In');
|
||||
$action = 'un='. AttrVal($name,'heosUsername','none') . '&pw=' . HEOSMaster_ReadPassword($hash) if($args[0] eq 'In');
|
||||
|
||||
} elsif($cmd eq 'password') {
|
||||
return "usage: password" if( @args != 1 );
|
||||
@ -274,7 +294,7 @@ sub HEOSMaster_Set($@) {
|
||||
|
||||
} else {
|
||||
my $list = "";
|
||||
$list .= "reopen:noArg getPlayers:noArg enableChangeEvents:on,off checkAccount:noArg signAccount:In,Out password reboot";
|
||||
$list .= "reopen:noArg getPlayers:noArg getGroups:noArg enableChangeEvents:on,off checkAccount:noArg signAccount:In,Out password reboot";
|
||||
return "Unknown argument $cmd, choose one of $list";
|
||||
}
|
||||
|
||||
@ -287,7 +307,7 @@ sub HEOSMaster_Open($) {
|
||||
my $name = $hash->{NAME};
|
||||
my $host = $hash->{HOST};
|
||||
my $port = 1255;
|
||||
my $timeout = 1;
|
||||
my $timeout = 0.1;
|
||||
|
||||
|
||||
Log3 $name, 4, "HEOSMaster ($name) - Baue Socket Verbindung auf";
|
||||
@ -307,8 +327,8 @@ sub HEOSMaster_Open($) {
|
||||
|
||||
Log3 $name, 4, "HEOSMaster ($name) - Socket Connected";
|
||||
|
||||
HEOSMaster_GetPlayers($hash);
|
||||
|
||||
InternalTimer( gettimeofday()+1, 'HEOSMaster_GetPlayers', $hash, 1 );
|
||||
InternalTimer( gettimeofday()+3, 'HEOSMaster_GetGroups', $hash, 1 );
|
||||
}
|
||||
|
||||
sub HEOSMaster_Close($) {
|
||||
@ -372,7 +392,8 @@ sub HEOSMaster_Read($) {
|
||||
$len = sysread($hash->{CD},$buf,1024); # die genaue Puffergröße wird noch ermittelt
|
||||
|
||||
if( !defined($len) || !$len ) {
|
||||
Log 1, "unknown buffer length";
|
||||
Log3 $name, 5, "HEOSMaster ($name) - connection closed by remote Host";
|
||||
HEOSMaster_Close($hash);
|
||||
return;
|
||||
}
|
||||
|
||||
@ -454,8 +475,8 @@ sub HEOSMaster_ResponseProcessing($$) {
|
||||
|
||||
}
|
||||
|
||||
if( $decode_json->{heos}{command} =~ /^player/ or $decode_json->{heos}{command} =~ /^event\/player/ or $decode_json->{heos}{command} =~ /^event\/repeat_mode_changed/ or $decode_json->{heos}{command} =~ /^event\/shuffle_mode_changed/ ) {
|
||||
if( ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
||||
if( $decode_json->{heos}{command} =~ /^player/ or $decode_json->{heos}{command} =~ /^event\/player/ or $decode_json->{heos}{command} =~ /^group/ or $decode_json->{heos}{command} =~ /^event\/group/ or $decode_json->{heos}{command} =~ /^event\/repeat_mode_changed/ or $decode_json->{heos}{command} =~ /^event\/shuffle_mode_changed/ ) {
|
||||
if( $decode_json->{heos}{command} =~ /^player/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
||||
|
||||
foreach my $payload (@{$decode_json->{payload}}) {
|
||||
|
||||
@ -465,7 +486,20 @@ sub HEOSMaster_ResponseProcessing($$) {
|
||||
|
||||
Dispatch($hash,$json,undef);
|
||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||
}
|
||||
|
||||
return;
|
||||
|
||||
} elsif( $decode_json->{heos}{command} =~ /^group/ and ref($decode_json->{payload}) eq "ARRAY" and scalar(@{$decode_json->{payload}}) > 0) {
|
||||
|
||||
foreach my $payload (@{$decode_json->{payload}}) {
|
||||
|
||||
$json = '{"gid": "';
|
||||
$json .= "$payload->{gid}";
|
||||
$json .= '","heos": {"command": "group/get_groups"}}';
|
||||
|
||||
Dispatch($hash,$json,undef);
|
||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||
}
|
||||
|
||||
return;
|
||||
@ -476,7 +510,7 @@ sub HEOSMaster_ResponseProcessing($$) {
|
||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||
return;
|
||||
|
||||
} elsif( $decode_json->{heos}{message} =~ /^pid=/ ) {
|
||||
} elsif( defined($decode_json->{heos}{message}) and $decode_json->{heos}{message} =~ /^pid=/ ) {
|
||||
|
||||
Dispatch($hash,$json,undef);
|
||||
Log3 $name, 4, "HEOSMaster ($name) - call Dispatcher";
|
||||
@ -517,7 +551,7 @@ sub HEOSMaster_WriteReadings($$) {
|
||||
|
||||
my $t;
|
||||
my $v;
|
||||
while( ( $t, $v ) = each $readingsHash ) {
|
||||
while( ( $t, $v ) = each (%{$readingsHash}) ) {
|
||||
if( defined( $v ) ) {
|
||||
|
||||
readingsBulkUpdate( $hash, $t, $v );
|
||||
@ -587,7 +621,7 @@ sub HEOSMaster_firstRun($) {
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
RemoveInternalTimer($hash);
|
||||
RemoveInternalTimer($hash,'HEOSMaster_firstRun');
|
||||
|
||||
HEOSMaster_Open($hash) if( !IsDisabled($name) );
|
||||
}
|
||||
@ -598,19 +632,33 @@ sub HEOSMaster_GetPlayers($) {
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
RemoveInternalTimer($hash,'HEOSMaster_GetPlayers');
|
||||
|
||||
HEOSMaster_Write($hash,'getPlayers',undef);
|
||||
Log3 $name, 4, "HEOSMaster ($name) - getPlayers";
|
||||
|
||||
InternalTimer( gettimeofday()+2, 'HEOSMaster_EnableChangeEvents', $hash, 0 );
|
||||
}
|
||||
|
||||
sub HEOSMaster_GetGroups($) {
|
||||
|
||||
my $hash = shift;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
RemoveInternalTimer($hash,'HEOSMaster_GetGroups');
|
||||
|
||||
HEOSMaster_Write($hash,'getGroups',undef);
|
||||
Log3 $name, 4, "HEOSMaster ($name) - getPlayers";
|
||||
}
|
||||
|
||||
sub HEOSMaster_EnableChangeEvents($) {
|
||||
|
||||
my $hash = shift;
|
||||
my $name = $hash->{NAME};
|
||||
|
||||
|
||||
RemoveInternalTimer($hash);
|
||||
RemoveInternalTimer($hash,'HEOSMaster_EnableChangeEvents');
|
||||
|
||||
HEOSMaster_Write($hash,'enableChangeEvents','on');
|
||||
Log3 $name, 4, "HEOSMaster ($name) - set enableChangeEvents on";
|
||||
|
||||
@ -34,7 +34,7 @@ use JSON qw(decode_json);
|
||||
use Encode qw(encode_utf8);
|
||||
|
||||
|
||||
my $version = "0.1.45";
|
||||
my $version = "0.1.47";
|
||||
|
||||
|
||||
|
||||
@ -52,6 +52,7 @@ sub HEOSPlayer_GetPlayerInfo($);
|
||||
sub HEOSPlayer_GetPlayState($);
|
||||
sub HEOSPlayer_GetNowPlayingMedia($);
|
||||
sub HEOSPlayer_GetPlayMode($);
|
||||
sub HEOSPlayer_GetVolume($);
|
||||
|
||||
|
||||
|
||||
@ -72,6 +73,7 @@ sub HEOSPlayer_Initialize($) {
|
||||
|
||||
$hash->{AttrList} = "IODev ".
|
||||
"disable:1 ".
|
||||
"mute2play:1 ".
|
||||
$readingFnAttributes;
|
||||
|
||||
|
||||
@ -129,8 +131,6 @@ sub HEOSPlayer_Define($$) {
|
||||
if( defined($d)
|
||||
&& $d->{IODev} == $hash->{IODev}
|
||||
&& $d->{NAME} ne $name );
|
||||
|
||||
$modules{HEOSPlayer}{defptr}{$code} = $hash;
|
||||
|
||||
|
||||
Log3 $name, 3, "HEOSPlayer ($name) - defined with Code: $code";
|
||||
@ -140,15 +140,17 @@ sub HEOSPlayer_Define($$) {
|
||||
|
||||
|
||||
if( $init_done ) {
|
||||
InternalTimer( gettimeofday()+int(rand(5)), "HEOSPlayer_GetPlayerInfo", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(10)), "HEOSPlayer_GetPlayState", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(15)), "HEOSPlayer_GetNowPlayingMedia", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(20)), "HEOSPlayer_GetPlayMode", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(2)), "HEOSPlayer_GetPlayerInfo", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(4)), "HEOSPlayer_GetPlayState", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(6)), "HEOSPlayer_GetNowPlayingMedia", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(8)), "HEOSPlayer_GetPlayMode", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+int(rand(10)), "HEOSPlayer_GetVolume", $hash, 0 );
|
||||
} else {
|
||||
InternalTimer( gettimeofday()+15+int(rand(5)), "HEOSPlayer_GetPlayerInfo", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(10)), "HEOSPlayer_GetPlayState", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(15)), "HEOSPlayer_GetNowPlayingMedia", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(20)), "HEOSPlayer_GetPlayMode", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(2)), "HEOSPlayer_GetPlayerInfo", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(4)), "HEOSPlayer_GetPlayState", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(6)), "HEOSPlayer_GetNowPlayingMedia", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(8)), "HEOSPlayer_GetPlayMode", $hash, 0 );
|
||||
InternalTimer( gettimeofday()+15+int(rand(10)), "HEOSPlayer_GetVolume", $hash, 0 );
|
||||
}
|
||||
|
||||
readingsBeginUpdate($hash);
|
||||
@ -158,6 +160,8 @@ sub HEOSPlayer_Define($$) {
|
||||
readingsEndUpdate($hash, 1);
|
||||
|
||||
|
||||
$modules{HEOSPlayer}{defptr}{$code} = $hash;
|
||||
|
||||
return undef;
|
||||
}
|
||||
|
||||
@ -312,13 +316,13 @@ sub HEOSPlayer_Set($$@) {
|
||||
} elsif( $cmd eq 'volumeUp' ) {
|
||||
return "usage: volumeUp 0-10" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'volumeUp';
|
||||
$heosCmd = $cmd;
|
||||
$action = "step=$args[0]";
|
||||
|
||||
} elsif( $cmd eq 'volumeDown' ) {
|
||||
return "usage: volumeDown 0-10" if( @args != 1 );
|
||||
|
||||
$heosCmd = 'volumeDown';
|
||||
$heosCmd = $cmd;
|
||||
$action = "step=$args[0]";
|
||||
|
||||
} else {
|
||||
@ -442,7 +446,7 @@ sub HEOSPlayer_WriteReadings($$) {
|
||||
|
||||
my $t;
|
||||
my $v;
|
||||
while( ( $t, $v ) = each $readingsHash ) {
|
||||
while( ( $t, $v ) = each (%{$readingsHash}) ) {
|
||||
if( defined( $v ) ) {
|
||||
|
||||
readingsBulkUpdate( $hash, $t, $v );
|
||||
@ -500,12 +504,18 @@ sub HEOSPlayer_PreProcessingReadings($$) {
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'playStatus'} = substr($value[1],6);
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /volume_changed/ or $decode_json->{heos}{command} =~ /set_volume/ ) {
|
||||
} elsif ( $decode_json->{heos}{command} =~ /volume_changed/ or $decode_json->{heos}{command} =~ /set_volume/ or $decode_json->{heos}{command} =~ /get_volume/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
$buffer{'volume'} = substr($value[1],6);
|
||||
$buffer{'mute'} = substr($value[2],5) if( $decode_json->{heos}{command} =~ /volume_changed/ );
|
||||
|
||||
if (defined($buffer{'mute'}) && AttrVal($name, 'mute2play', 0) == 1) {
|
||||
|
||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=play") if $buffer{'mute'} eq "off";
|
||||
IOWrite($hash,'setPlayState',"pid=$hash->{PID}&state=stop") if $buffer{'mute'} eq "on";
|
||||
}
|
||||
|
||||
} elsif ( $decode_json->{heos}{command} =~ /play_mode/ ) {
|
||||
|
||||
my @value = split('&', $decode_json->{heos}{message});
|
||||
@ -603,6 +613,15 @@ sub HEOSPlayer_GetNowPlayingMedia($) {
|
||||
|
||||
}
|
||||
|
||||
sub HEOSPlayer_GetVolume($) {
|
||||
|
||||
my $hash = shift;
|
||||
|
||||
RemoveInternalTimer($hash,'HEOSPlayer_GetVolume');
|
||||
IOWrite($hash,'getVolume',"pid=$hash->{PID}");
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user