FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-30 18:12:28 +00:00
Code Issues Releases Wiki Activity

49_SSCamSTRM: V2.1.0, change get popupStream to set popupStream

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@17956 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-12-11 19:34:15 +00:00
parent fcb96f4428
commit d4b9d77d35
5 changed files with 43 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
fhem/CHANGED
View File

@ -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_SSCamSTRM: V2.1.0, change get popupStream to set popupStream
- feature: 49_SSCam: V7.7.0, autocreateCams command added to SVS device,
SSCamSTRM devices have get popupStream command, pls.
execute "get <SSCam> versionNotes" for further info

2
fhem/FHEM/49_SSCam.pm
View File

@ -101,7 +101,7 @@ our %SSCam_vNotesIntern = (
our %SSCam_vNotesExtern = (
"7.7.0" => "10.12.2018 autocreateCams command added to SVS device. By this command all cameras installed in SVS can be ".
"defined automatically. <br>".
"In SSCamSTRM devices the \"get &lt;name&gt; popupStream\" command is implemented which may open a popup window with the ".
"In SSCamSTRM devices the \"set &lt;name&gt; popupStream\" command is implemented which may open a popup window with the ".
"active streaming content. ",
"7.6.0" => "02.12.2018 The PTZ panel is completed by \"Preset\" and \"Patrol\" (only for PTZ cameras) ",
"7.5.0" => "02.12.2018 A click on suitable content in a stream- or snapgallery device opens a popup window. ".

32
fhem/FHEM/49_SSCamSTRM.pm
View File

@ -34,6 +34,7 @@ use warnings;
# Versions History intern
our %SSCamSTRM_vNotesIntern = (
"2.1.0" => "11.12.2018 switch \"popupStream\" from get to set ",
"2.0.0" => "09.12.2018 get command \"popupStream\" and attribute \"popupStreamFW\" ",
"1.5.0" => "02.12.2018 new attribute \"popupWindowSize\" ",
"1.4.1" => "31.10.2018 attribute \"autoLoop\" changed to \"autoRefresh\", new attribute \"autoRefreshFW\" ",
@ -65,7 +66,7 @@ sub SSCamSTRM_Initialize($) {
my $fwd = join(",",devspec2array("TYPE=FHEMWEB:FILTER=STATE=Initialized"));
$hash->{DefFn} = "SSCamSTRM_Define";
$hash->{GetFn} = "SSCamSTRM_Get";
$hash->{SetFn} = "SSCamSTRM_Set";
$hash->{AttrList} = "autoRefresh:selectnumbers,120,0.2,1800,0,log10 ".
"autoRefreshFW:$fwd ".
"disable:1,0 ".
@ -107,7 +108,7 @@ return undef;
}
################################################################
sub SSCamSTRM_Get($@) {
sub SSCamSTRM_Set($@) {
my ($hash, @a) = @_;
return "\"set X\" needs at least an argument" if ( @a < 2 );
my $name = $a[0];
@ -116,7 +117,7 @@ sub SSCamSTRM_Get($@) {
return if(IsDisabled($name) || $hash->{MODEL} =~ /ptzcontrol|snapgallery/);
my $getlist = "Unknown argument $opt, choose one of ".
my $setlist = "Unknown argument $opt, choose one of ".
"popupStream "
;
@ -124,7 +125,7 @@ sub SSCamSTRM_Get($@) {
my $txt = SSCam_getclhash($hash);
return $txt if($txt);
my $link = AnalyzePerlCommand(undef, $hash->{LINK}) if($hash->{LINK} =~ m/^{(.*)}$/s);
my $link = AnalyzePerlCommand(undef, $hash->{LINK});
# OK-Dialogbox oder Autoclose
my $todef = 5;
@ -144,6 +145,9 @@ sub SSCamSTRM_Get($@) {
my $out = "<html>";
$out .= $htmlCode;
$out .= "</html>";
Log3($name, 4, "$name - Stream to display: $htmlCode");
Log3($name, 4, "$name - Stream display to webdevice: $pd");
if($to =~ /\d+/) {
map {FW_directNotify("#FHEMWEB:$_", "FW_errmsg('$out', $to)", "")} devspec2array("$pd");
@ -153,7 +157,7 @@ sub SSCamSTRM_Get($@) {
}
} else {
return "$getlist";
return "$setlist";
}
return;
@ -281,6 +285,7 @@ Dependend of the Streaming-Device state, different buttons are provided to start
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<br><br>
<ul>
A SSCam Streaming-device is defined by the SSCam "set &lt;name&gt; createStreamDev" command.
@ -289,10 +294,7 @@ Dependend of the Streaming-Device state, different buttons are provided to start
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b>
<b>Set</b>
<ul>
<ul>
@ -310,6 +312,9 @@ Dependend of the Streaming-Device state, different buttons are provided to start
</ul>
<br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attributes</b>
<br><br>
@ -434,6 +439,7 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<br><br>
<ul>
Ein SSCam Streaming-Device wird durch den SSCam Befehl "set &lt;name&gt; createStreamDev" erstellt.
@ -442,10 +448,7 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b>
<b>Set</b>
<ul>
<ul>
@ -463,6 +466,9 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
</ul>
<br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attribute</b>

4
fhem/contrib/DS_Starter/49_SSCam.pm
View File

@ -1,5 +1,5 @@
########################################################################################################################
# $Id: 49_SSCam.pm 17891 2018-12-03 21:52:16Z DS_Starter $
# $Id: 49_SSCam.pm 17950 2018-12-10 22:11:29Z DS_Starter $
#########################################################################################################################
# 49_SSCam.pm
#
@ -101,7 +101,7 @@ our %SSCam_vNotesIntern = (
our %SSCam_vNotesExtern = (
"7.7.0" => "10.12.2018 autocreateCams command added to SVS device. By this command all cameras installed in SVS can be ".
"defined automatically. <br>".
"In SSCamSTRM devices the \"get &lt;name&gt; popupStream\" command is implemented which may open a popup window with the ".
"In SSCamSTRM devices the \"set &lt;name&gt; popupStream\" command is implemented which may open a popup window with the ".
"active streaming content. ",
"7.6.0" => "02.12.2018 The PTZ panel is completed by \"Preset\" and \"Patrol\" (only for PTZ cameras) ",
"7.5.0" => "02.12.2018 A click on suitable content in a stream- or snapgallery device opens a popup window. ".

34
fhem/contrib/DS_Starter/49_SSCamSTRM.pm
View File

@ -1,5 +1,5 @@
########################################################################################################################
# $Id: 49_SSCamSTRM.pm 17891 2018-12-03 21:52:16Z DS_Starter $
# $Id: 49_SSCamSTRM.pm 17950 2018-12-10 22:11:29Z DS_Starter $
#########################################################################################################################
# 49_SSCamSTRM.pm
#
@ -34,6 +34,7 @@ use warnings;
# Versions History intern
our %SSCamSTRM_vNotesIntern = (
"2.1.0" => "11.12.2018 switch \"popupStream\" from get to set ",
"2.0.0" => "09.12.2018 get command \"popupStream\" and attribute \"popupStreamFW\" ",
"1.5.0" => "02.12.2018 new attribute \"popupWindowSize\" ",
"1.4.1" => "31.10.2018 attribute \"autoLoop\" changed to \"autoRefresh\", new attribute \"autoRefreshFW\" ",
@ -65,7 +66,7 @@ sub SSCamSTRM_Initialize($) {
my $fwd = join(",",devspec2array("TYPE=FHEMWEB:FILTER=STATE=Initialized"));
$hash->{DefFn} = "SSCamSTRM_Define";
$hash->{GetFn} = "SSCamSTRM_Get";
$hash->{SetFn} = "SSCamSTRM_Set";
$hash->{AttrList} = "autoRefresh:selectnumbers,120,0.2,1800,0,log10 ".
"autoRefreshFW:$fwd ".
"disable:1,0 ".
@ -107,7 +108,7 @@ return undef;
}
################################################################
sub SSCamSTRM_Get($@) {
sub SSCamSTRM_Set($@) {
my ($hash, @a) = @_;
return "\"set X\" needs at least an argument" if ( @a < 2 );
my $name = $a[0];
@ -116,7 +117,7 @@ sub SSCamSTRM_Get($@) {
return if(IsDisabled($name) || $hash->{MODEL} =~ /ptzcontrol|snapgallery/);
my $getlist = "Unknown argument $opt, choose one of ".
my $setlist = "Unknown argument $opt, choose one of ".
"popupStream "
;
@ -124,7 +125,7 @@ sub SSCamSTRM_Get($@) {
my $txt = SSCam_getclhash($hash);
return $txt if($txt);
my $link = AnalyzePerlCommand(undef, $hash->{LINK}) if($hash->{LINK} =~ m/^{(.*)}$/s);
my $link = AnalyzePerlCommand(undef, $hash->{LINK});
# OK-Dialogbox oder Autoclose
my $todef = 5;
@ -144,6 +145,9 @@ sub SSCamSTRM_Get($@) {
my $out = "<html>";
$out .= $htmlCode;
$out .= "</html>";
Log3($name, 4, "$name - Stream to display: $htmlCode");
Log3($name, 4, "$name - Stream display to webdevice: $pd");
if($to =~ /\d+/) {
map {FW_directNotify("#FHEMWEB:$_", "FW_errmsg('$out', $to)", "")} devspec2array("$pd");
@ -153,7 +157,7 @@ sub SSCamSTRM_Get($@) {
}
} else {
return "$getlist";
return "$setlist";
}
return;
@ -281,6 +285,7 @@ Dependend of the Streaming-Device state, different buttons are provided to start
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<br><br>
<ul>
A SSCam Streaming-device is defined by the SSCam "set &lt;name&gt; createStreamDev" command.
@ -289,10 +294,7 @@ Dependend of the Streaming-Device state, different buttons are provided to start
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b>
<b>Set</b>
<ul>
<ul>
@ -310,6 +312,9 @@ Dependend of the Streaming-Device state, different buttons are provided to start
</ul>
<br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attributes</b>
<br><br>
@ -434,6 +439,7 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
<ul>
<a name="SSCamSTRMdefine"></a>
<b>Define</b>
<br><br>
<ul>
Ein SSCam Streaming-Device wird durch den SSCam Befehl "set &lt;name&gt; createStreamDev" erstellt.
@ -442,10 +448,7 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
</ul>
<a name="SSCamSTRMset"></a>
<b>Set</b> <ul>N/A</ul><br>
<a name="SSCamSTRMget"></a>
<b>Get</b>
<b>Set</b>
<ul>
<ul>
@ -463,6 +466,9 @@ Abhängig vom Zustand des Streaming-Devices werden zum Start von Aktionen unters
</ul>
<br>
<a name="SSCamSTRMget"></a>
<b>Get</b> <ul>N/A</ul><br>
<a name="SSCamSTRMattr"></a>
<b>Attribute</b>