From 35b7c0ad9980c7cc7c5334a9d19b7401ac6bcf2d Mon Sep 17 00:00:00 2001 From: nasseeder1 Date: Thu, 14 Jun 2018 10:54:21 +0000 Subject: [PATCH] 49_SSCam: global vars git-svn-id: https://svn.fhem.de/fhem/trunk@16869 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/FHEM/49_SSCam.pm | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index 7f1a2bba1..d22df917b 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -27,6 +27,7 @@ ######################################################################################################################### # Versions History: # +# 5.2.1 14.06.2018 design change of SSCam_StreamDev # 5.2.0 14.06.2018 support longpoll refresh of SSCamSTRM-Devices # 5.1.0 13.06.2018 more control elements (Start/Stop Recording, Take Snapshot) in func SSCam_StreamDev # control of detaillink is moved to SSCamSTRM-device @@ -233,7 +234,7 @@ use Time::HiRes; use HttpUtils; # no if $] >= 5.017011, warnings => 'experimental'; -my $SSCamVersion = "5.2.0"; +my $SSCamVersion = "5.2.1"; # Aufbau Errorcode-Hashes (siehe Surveillance Station Web API) my %SSCam_errauthlist = ( @@ -283,6 +284,11 @@ my %SSCam_errlist = ( my $SSCam_slim = 3; # default Anzahl der abzurufenden Schnappschüsse mit snapGallery my $SSCAM_snum = "1,2,3,4,5,6,7,8,9,10"; # mögliche Anzahl der abzurufenden Schnappschüsse mit snapGallery +use vars qw($FW_ME); # webname (default is fhem), used by 97_GROUP/weblink +use vars qw($FW_subdir); # Sub-path in URL, used by FLOORPLAN/weblink +use vars qw($FW_room); # currently selected room +use vars qw($FW_detail); # currently selected device for detail view + sub SSCam_Initialize($) { my ($hash) = @_; $hash->{DefFn} = "SSCam_Define"; @@ -5627,7 +5633,6 @@ sub SSCam_ptzpanel($;$$) { $img = ""; # $FW_ME = URL-Pfad unter dem der FHEMWEB-Server via HTTP erreichbar ist, z.B. /fhem } if ($cmd || $cmd eq "0") { - # $cmd = "cmd.$name=set $name $cmd"; $cmd = "cmd=set $name $cmd"; $ptz_ret .= "$img"; # $FW_subdir = Sub-path in URL, used by FLOORPLAN/weblink } else { @@ -5744,6 +5749,7 @@ sub SSCam_StreamDev($$$) { $hash->{HELPER}{STRMDETAIL} = $FW_detail?$FW_detail:""; # Name des SSCamSTRM-Devices (wenn Detailansicht) # Definition Tasten + my $imgblank = ""; # nicht sichtbare Leertaste my $cmdstop = "cmd=set $camname stopView"; # Stream deaktivieren my $imgstop = ""; my $cmdhlsreact = "cmd=set $camname hlsreactivate"; # HLS Stream reaktivieren @@ -5884,6 +5890,7 @@ sub SSCam_StreamDev($$$) {
"; $ret .= "$imgstop "; $ret .= "$imghlsreact "; + $ret .= $imgblank; if(ReadingsVal($camname, "Record", "Stop") eq "Stop") { # Aufnahmebutton endlos Start $ret .= "$imgrecendless ";