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

add events on playStatus and power readings

Browse Source 
better handling of power events
suppress "cleint disconnect" and "client reconnect" CLI messages
(oliv06)


git-svn-id: https://svn.fhem.de/fhem/trunk@4889 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
playwithfree 2014-02-12 01:02:28 +00:00
parent e1e7a5f500
commit 292226ecbc
1 changed files with 35 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
fhem/contrib/98_SB_PLAYER.pm
View File

@ -374,7 +374,9 @@ sub SB_PLAYER_Parse( $$ ) {
if( $cmd eq "mixer" ) {
if( $args[ 0 ] eq "volume" ) {
# update the volume
if( scalar( $args[ 1 ] ) > 0 ) {
if ($args[ 1 ] eq "?") {
# it is a request
} elsif( scalar( $args[ 1 ] ) > 0 ) {
readingsSingleUpdate( $hash, "volume",
scalar( $args[ 1 ] ), 0 );
} else {
@ -386,25 +388,29 @@ sub SB_PLAYER_Parse( $$ ) {
}
} elsif( $cmd eq "play" ) {
readingsSingleUpdate( $hash, "playStatus", "playing", 0 );
readingsSingleUpdate( $hash, "playStatus", "playing", 1 );
} elsif( $cmd eq "stop" ) {
readingsSingleUpdate( $hash, "playStatus", "stopped", 0 );
readingsSingleUpdate( $hash, "playStatus", "stopped", 1 );
} elsif( $cmd eq "pause" ) {
readingsBulkUpdate( $hash, "playStatus", "paused" );
if( $args[ 0 ] eq "0" ) {
readingsSingleUpdate( $hash, "playStatus", "playing", 1 );
} else {
readingsSingleUpdate( $hash, "playStatus", "paused", 1 );
}
} elsif( $cmd eq "mode" ) {
Log3( $hash, 1, "Playmode: $args[ 0 ]" );
#Log3( $hash, 1, "Playmode: $args[ 0 ]" );
# alittle more complex to fulfill FHEM Development guidelines
if( $args[ 0 ] eq "play" ) {
readingsSingleUpdate( $hash, "playStatus", "playing", 0 );
readingsSingleUpdate( $hash, "playStatus", "playing", 1 );
} elsif( $args[ 0 ] eq "stop" ) {
readingsSingleUpdate( $hash, "playStatus", "stopped", 0 );
readingsSingleUpdate( $hash, "playStatus", "stopped", 1 );
} elsif( $args[ 0 ] eq "pause" ) {
readingsSingleUpdate( $hash, "playStatus", "paused", 0 );
readingsSingleUpdate( $hash, "playStatus", "paused", 1 );
} else {
readingsSingleUpdate( $hash, "playStatus", $args[ 0 ], 0 );
readingsSingleUpdate( $hash, "playStatus", $args[ 0 ], 1 );
}
} elsif( $cmd eq "newmetadata" ) {
@ -501,13 +507,25 @@ sub SB_PLAYER_Parse( $$ ) {
}
} elsif( $cmd eq "power" ) {
if( $args[ 0 ] eq "1" ) {
readingsSingleUpdate( $hash, "state", "on", 1 );
readingsSingleUpdate( $hash, "power", "on", 0 );
} else {
readingsSingleUpdate( $hash, "state", "off", 1 );
readingsSingleUpdate( $hash, "power", "off", 0 );
if (!(@args)) {
# power toggle : should only happen when called with SB CLI
if (ReadingsVal($hash->{NAME}, "state", "off") eq "on") {
readingsSingleUpdate( $hash, "presence", "absent", 0 );
readingsSingleUpdate( $hash, "state", "off", 1 );
readingsSingleUpdate( $hash, "power", "off", 1 );
} else {
readingsSingleUpdate( $hash, "state", "on", 1 );
readingsSingleUpdate( $hash, "power", "on", 1 );
}
} elsif( $args[ 0 ] eq "1" ) {
readingsSingleUpdate( $hash, "state", "on", 1 );
readingsSingleUpdate( $hash, "power", "on", 1 );
} elsif( $args[ 0 ] eq "0" ) {
readingsSingleUpdate( $hash, "presence", "absent", 0 );
readingsSingleUpdate( $hash, "state", "off", 1 );
readingsSingleUpdate( $hash, "power", "off", 1 );
} else {
# should be "?" normally
}
} elsif( $cmd eq "displaytype" ) {
@ -555,7 +573,8 @@ sub SB_PLAYER_Parse( $$ ) {
# TODO
Log3( $hash, 5, "SB_PLAYER_Parse($name): please implement the " .
"parser for the status answer" );
} elsif( $cmd eq "client" ) {
# filter "client disconnect" and "client reconnect" messages
} elsif( $cmd eq "prefset" ) {
if( $args[ 0 ] eq "server" ) {
if( $args[ 1 ] eq "currentSong" ) {
@ -1091,6 +1110,7 @@ sub SB_PLAYER_RecBroadcast( $$@ ) {
# the server is off, so are we
RemoveInternalTimer( $hash );
readingsSingleUpdate( $hash, "state", "off", 1 );
readingsSingleUpdate( $hash, "power", "off", 1 );
} elsif( $args[ 0 ] eq "ON" ) {
# the server is back
# do and update of the status