FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 03:06:37 +00:00
Code Issues Releases Wiki Activity

49_SSCam: V5.0.0, HLS Streaming implemented, new Streamingdevice based on module 49_SSCamSTRM, some improvements & fixes

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@16850 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
nasseeder1 2018-06-11 16:05:09 +00:00
parent 14d92d3f96
commit 825385aa54
3 changed files with 564 additions and 228 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/CHANGED
View File

@ -1,5 +1,7 @@
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # 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. # Do not insert empty lines here, update check depends on it.
- feature: 49_SSCam: V5.0.0, HLS Streaming implemented, new Streamingdevice
based on module 49_SSCamSTRM, some improvements & fixes
- feature: 98_Text2Speech: added Duch language for Google TTS - feature: 98_Text2Speech: added Duch language for Google TTS
- feature: 74_UnifiSwitch: initial version - feature: 74_UnifiSwitch: initial version
- feature: 74_Unifi: new child-Module UnifiSwitch - feature: 74_Unifi: new child-Module UnifiSwitch

760
fhem/FHEM/49_SSCam.pm
View File

File diff suppressed because it is too large Load Diff

30
fhem/FHEM/49_SSCamSTRM.pm
View File

@ -4,11 +4,11 @@
# 49_SSCamSTRM.pm # 49_SSCamSTRM.pm
# #
# (c) 2018 by Heiko Maaz # (c) 2018 by Heiko Maaz
# forked from 98_weblink.pm by Rudolf König
# e-mail: Heiko dot Maaz at t-online dot de # e-mail: Heiko dot Maaz at t-online dot de
# #
# This Module is used by module 49_SSCam to create Streaming devices. # This Module is used by module 49_SSCam to create Streaming devices.
# It can't be used to create standalone devices wihout any SSCam-Device # It can't be used without any SSCam-Device.
# The module is based on 98_weblink.pm of Rudolf König.
# #
# This script is part of fhem. # This script is part of fhem.
# #
@ -28,6 +28,7 @@
######################################################################################################################### #########################################################################################################################
# Versions History: # Versions History:
# #
# 0.2 11.06.2018 check in with SSCam 5.0.0
# 0.1 10.06.2018 initial Version # 0.1 10.06.2018 initial Version
@ -37,9 +38,9 @@ use strict;
use warnings; use warnings;
use vars qw($FW_subdir); # Sub-path in URL for extensions, e.g. 95_FLOORPLAN use vars qw($FW_subdir); # Sub-path in URL for extensions, e.g. 95_FLOORPLAN
my $SSCamSTRMVersion = "0.1"; my $SSCamSTRMVersion = "0.2";
##################################### ################################################################
sub SSCamSTRM_Initialize($) { sub SSCamSTRM_Initialize($) {
my ($hash) = @_; my ($hash) = @_;
@ -51,7 +52,7 @@ sub SSCamSTRM_Initialize($) {
} }
##################################### ################################################################
sub SSCamSTRM_Define($$) { sub SSCamSTRM_Define($$) {
my ($hash, $def) = @_; my ($hash, $def) = @_;
my ($name, $type, $link) = split("[ \t]+", $def, 3); my ($name, $type, $link) = split("[ \t]+", $def, 3);
@ -74,21 +75,7 @@ sub SSCamSTRM_Define($$) {
return undef; return undef;
} }
##################################### ################################################################
# FLOORPLAN compat
sub FW_showSSCamSTRM($$$$) {
my ($d,undef,undef,$buttons) = @_;
if($buttons !~ m/HASH/) {
my %h = (); $buttons = \%h;
}
FW_pO(SSCamSTRM_FwFn(undef, $d, "", $buttons));
return $buttons;
}
##################
sub SSCamSTRM_FwDetail($@) { sub SSCamSTRM_FwDetail($@) {
my ($d, $text, $nobr)= @_; my ($d, $text, $nobr)= @_;
return "" if(AttrVal($d, "group", "")); return "" if(AttrVal($d, "group", ""));
@ -102,6 +89,7 @@ sub SSCamSTRM_FwDetail($@) {
return $ret; return $ret;
} }
################################################################
sub SSCamSTRM_FwFn($$$$) { sub SSCamSTRM_FwFn($$$$) {
my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn. my ($FW_wname, $d, $room, $pageHash) = @_; # pageHash is set for summaryFn.
my $hash = $defs{$d}; my $hash = $defs{$d};
@ -122,7 +110,7 @@ return $ret;
=pod =pod
=item summary define a Streaming device by SSCam module =item summary define a Streaming device by SSCam module
=item summary_DE Erstellung eines Streaming-Device durch SSCam-Modul =item summary_DE Erstellung eines Streaming-Device durch das SSCam-Modul
=begin html =begin html
<a name="SSCamSTRM"></a> <a name="SSCamSTRM"></a>