diff --git a/fhem/CHANGED b/fhem/CHANGED index 0691808d7..885c5fde2 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 49_SSCam: V8.11.4, make SSCam ready for SVS version 8.2.3-5829 - feature: mqtt2.template: add filters to limit shown templates - feature: 72_XiaomiDevice: added map exclusion features of V2 vacuum - feature: 32_withings: added some new sleep readings diff --git a/fhem/FHEM/49_SSCam.pm b/fhem/FHEM/49_SSCam.pm index d10c019d7..622dfe054 100644 --- a/fhem/FHEM/49_SSCam.pm +++ b/fhem/FHEM/49_SSCam.pm @@ -47,6 +47,7 @@ use Encode; # Versions History intern our %SSCam_vNotesIntern = ( + "8.11.4" => "11.03.2019 make module ready for SVS version 8.2.3-5829 ", "8.11.3" => "08.03.2019 avoid possible JSON errors, fix fhem is hanging while restart or get snapinfo - Forum: #45671.msg915546.html#msg915546 ", "8.11.2" => "04.03.2019 bugfix no snapinfos when snap was done by SVS itself, Forum: https://forum.fhem.de/index.php/topic,45671.msg914685.html#msg914685", "8.11.1" => "28.02.2019 commandref revised, minor fixes ", @@ -1727,8 +1728,8 @@ sub SSCam_FWsummaryFn ($$$$) { $ret .= ""; if($wltype eq "image") { - if(SSCam_myVersion($hash) == 823 && ReadingsVal($name, "CamVideoType", "") !~ /MJPEG/) { - $ret .= "
Because SVS Version 8.2.3 is running the video format has to be set to MJPEG in SVS !

"; + if(ReadingsVal($name, "SVSversion", "8.2.3-5828") eq "8.2.3-5828" && ReadingsVal($name, "CamVideoType", "") !~ /MJPEG/) { + $ret .= "
Because SVS version 8.2.3-5828 is running you cannot see the MJPEG-Stream. Please upgrade to a higher SVS version !

"; } else { $ret .= "
"; } @@ -7079,8 +7080,8 @@ sub SSCam_StreamDev($$$) { } if ($fmt =~ /mjpeg/) { - if(SSCam_myVersion($hash) == 823 && ReadingsVal($camname, "CamVideoType", "") !~ /MJPEG/) { - $ret .= "
Because SVS Version 8.2.3 is running the video format has to be set to MJPEG in SVS !

"; + if(ReadingsVal($camname, "SVSversion", "8.2.3-5828") eq "8.2.3-5828" && ReadingsVal($camname, "CamVideoType", "") !~ /MJPEG/) { + $ret .= "
Because SVS version 8.2.3-5828 is running you cannot see the MJPEG-Stream. Please upgrade to a higher SVS version !

"; } else { if($apivideostmsmaxver) { $link = "$proto://$serveraddr:$serverport/webapi/$apivideostmspath?api=$apivideostms&version=$apivideostmsmaxver&method=Stream&cameraId=$camid&format=mjpeg&_sid=$sid"; @@ -7237,8 +7238,8 @@ sub SSCam_StreamDev($$$) { if($link && $wltype =~ /image|iframe|video|base64img|embed|hls/) { if($wltype =~ /image/) { - if(SSCam_myVersion($hash) == 823 && ReadingsVal($camname, "CamVideoType", "") !~ /MJPEG/) { - $ret .= "
Because SVS Version 8.2.3 is running the video format has to be set to MJPEG in SVS !

"; + if(ReadingsVal($camname, "SVSversion", "8.2.3-5828") eq "8.2.3-5828" && ReadingsVal($camname, "CamVideoType", "") !~ /MJPEG/) { + $ret .= "
Because SVS version 8.2.3-5828 is running you cannot see the MJPEG-Stream. Please upgrade to a higher SVS version !

"; } else { $ret .= "')\">
" if($link); $streamHash->{HELPER}{STREAM} = ""; # Stream für "set popupStream" speichern