From b0f25d900fd88cd388b47ced266a4c519e74f620 Mon Sep 17 00:00:00 2001
From: nasseeder1 <nasseeder1@users.noreply.github.com>
Date: Fri, 17 Jul 2020 11:52:37 +0000
Subject: [PATCH] 49_SSCam: contrib 9.5.0

git-svn-id: https://svn.fhem.de/fhem/trunk@22418 2b470e98-0d58-463d-a4d8-8e2adae1ed80
---
 fhem/contrib/DS_Starter/49_SSCam.pm     | 13 +++----------
 fhem/contrib/DS_Starter/49_SSCamSTRM.pm | 11 ++++-------
 2 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/fhem/contrib/DS_Starter/49_SSCam.pm b/fhem/contrib/DS_Starter/49_SSCam.pm
index 784935332..bf6fea815 100644
--- a/fhem/contrib/DS_Starter/49_SSCam.pm
+++ b/fhem/contrib/DS_Starter/49_SSCam.pm
@@ -2325,7 +2325,6 @@ sub FWdetailFn {
   
   my %pars = ( linkparent => $name,
                linkname   => $name,
-               linkmodel  => '',
                ftui       => 0
              );
              
@@ -7763,8 +7762,8 @@ sub ptzPanel {
   my $paref       = shift;
   my $name        = $paref->{linkparent}; 
   my $ptzcdev     = $paref->{linkname}; 
-  my $ptzcontrol  = $paref->{linkmodel}; 
   my $ftui        = $paref->{ftui};  
+  
   my $hash        = $defs{$name};
   my $iconpath    = AttrVal    ("$name", "ptzPanel_iconPath",   "www/images/sscam");
   my $iconprefix  = AttrVal    ("$name", "ptzPanel_iconPrefix", "black_btn_"      );
@@ -8027,9 +8026,7 @@ return;
 }
 
 ######################################################################################
-#      Funktion für SSCamSTRM-Devices - Kamera Liveview weblink device
-#      API: SYNO.SurveillanceStation.VideoStreaming
-#      Methode: GetLiveViewPath
+#      Funktion für SSCamSTRM-Devices
 #
 #      $camname = Name der Kamaera (Parent-Device)
 #      $strmdev = Name des Streaming-Devices
@@ -8336,7 +8333,6 @@ sub _streamDevMJPEG {
   if(AttrVal($camname,"ptzPanel_use",1)) {
       my %pars    = ( linkparent => $camname,
                       linkname   => $strmdev,
-                      linkmodel  => '',
                       ftui       => $ftui
                     );
       my $ptz_ret = ptzPanel(\%pars);
@@ -8506,7 +8502,6 @@ sub _streamDevGENERIC {
   if(AttrVal($camname,"ptzPanel_use",1)) {
       my %pars    = ( linkparent => $camname,
                       linkname   => $strmdev,
-                      linkmodel  => '',
                       ftui       => $ftui
                     );
       my $ptz_ret = ptzPanel(\%pars);
@@ -8597,7 +8592,6 @@ sub _streamDevHLS {
   if(AttrVal($camname,"ptzPanel_use",1)) {
       my %pars    = ( linkparent => $camname,
                       linkname   => $strmdev,
-                      linkmodel  => '',
                       ftui       => $ftui
                     );
       my $ptz_ret = ptzPanel(\%pars);
@@ -8738,7 +8732,6 @@ sub __switchedIMAGE {
   if(AttrVal($camname,"ptzPanel_use",1) && $hash->{HELPER}{RUNVIEW} =~ /live_fw/x) {
       my %pars    = ( linkparent => $camname,
                       linkname   => $strmdev,
-                      linkmodel  => '',
                       ftui       => $ftui
                     );
       my $ptz_ret = ptzPanel(\%pars);
@@ -9012,7 +9005,6 @@ sub __switchedHLS {
   if(AttrVal($camname,"ptzPanel_use",1)) {
       my %pars    = ( linkparent => $camname,
                       linkname   => $strmdev,
-                      linkmodel  => '',
                       ftui       => $ftui
                     );
       my $ptz_ret = ptzPanel(\%pars);
@@ -9079,6 +9071,7 @@ sub composeGallery {
   my $name     = $paref->{linkparent}; 
   my $strmdev  = $paref->{linkname};  
   my $ftui     = $paref->{ftui};
+  
   my $hash     = $defs{$name};
   my $camname  = $hash->{CAMNAME};                                      
   my $sgc      = AttrVal($name,"snapGalleryColumns",3);                                       # Anzahl der Images in einer Tabellenzeile
diff --git a/fhem/contrib/DS_Starter/49_SSCamSTRM.pm b/fhem/contrib/DS_Starter/49_SSCamSTRM.pm
index 1c833a1c0..dd76dcd22 100644
--- a/fhem/contrib/DS_Starter/49_SSCamSTRM.pm
+++ b/fhem/contrib/DS_Starter/49_SSCamSTRM.pm
@@ -410,7 +410,7 @@ sub FwFn {
   
   explodeLinkData ($hash, $clink, 0);
   
-  # my $link = "{$hash->{LINKFN}('$hash->{LINKPARENT}','$hash->{LINKNAME}','$hash->{LINKMODEL}')}";
+  # Beispielsyntax: "{$hash->{LINKFN}('$hash->{LINKPARENT}','$hash->{LINKNAME}','$hash->{LINKMODEL}')}";
   
   my $ftui   = 0;
   my $linkfn = $hash->{LINKFN};
@@ -421,7 +421,7 @@ sub FwFn {
                );
   
   no strict "refs";                                      ## no critic 'NoStrict' 
-  my $html = &{$linkfn}(\%pars);
+  my $html = eval{ &{$linkfn}(\%pars) } or do { return qq{Error in Streaming function definition of <html><a href=\"/fhem?detail=$name\">$name</a></html>} };
   use strict "refs";  
   
   my $ret = "";
@@ -571,10 +571,7 @@ sub streamAsHtml {
   my $clink = ReadingsVal($name, "clientLink", "");
   
   explodeLinkData ($hash, $clink, 0);
-  
-  #my $link = "{$hash->{LINKFN}('$hash->{LINKPARENT}','$hash->{LINKNAME}','$hash->{LINKMODEL}')}";
-  #$link = "{$hash->{LINKFN}('$hash->{LINKPARENT}','$hash->{LINKNAME}','$hash->{LINKMODEL}','$ftui')}" if($ftui && $ftui eq "ftui");   # Aufruf aus TabletUI -> FW_cmd ersetzen gemäß FTUI Syntax
-  
+    
   my $linkfn = $hash->{LINKFN};
   my %pars   = ( linkparent => $hash->{LINKPARENT},
 			     linkname   => $hash->{LINKNAME},
@@ -583,7 +580,7 @@ sub streamAsHtml {
                );
   
   no strict "refs";                                      ## no critic 'NoStrict' 
-  my $html = &{$linkfn}(\%pars);
+  my $html = eval{ &{$linkfn}(\%pars) } or do { return qq{Error in Streaming function definition of <html><a href=\"/fhem?detail=$name\">$name</a></html>} };
   use strict "refs"; 
   
   my $ret = "<html>";