Commit Graph

252 Commits

Author SHA1 Message Date
Isaac Connor
bfeee1ed09 rename Onvif_Alarm_Txt to ONVIF_Alarm_Text 2022-07-23 16:08:27 -04:00
ovargasp
981769b9db Allows users to set an specific "Onvif alarm text" for each monitor (#3535)
* Allows users to set an specific "Onvif alarm text" for each monitor

With this personalization the cameras that use strings different to "MotionAlarm"
such as Dahua, will be able to process their Onvif alarms. To make it easier, the change
sets a default "Alarm Text"  value for it to work out of the box and then allows to
modify it according to the particular necessities of each brand. It consists of
a new column on table Monitors, changes on Monitors.h, Monitors.cpp and a change
on UI to manage the value of Alarm Text per camera.

Updated es_la.php language file.

Co-authored-by: ovargasp <ovargasp@hoitmail.com>
2022-07-20 12:51:13 -05:00
Isaac Connor
2141a5dd1c Don't include 0 width in janus video tag 2022-06-15 13:08:48 -04:00
Isaac Connor
c189250a61 Add AnalysisImage and options to MOnitor object 2022-06-15 11:27:48 -04:00
Isaac Connor
d97ef46b57 Add defaults for RecordingSource and AnalysisSource to prevent warnings when creating new monitor 2022-05-30 14:28:38 -04:00
Isaac Connor
e11030095c Add mode=single option 2022-05-30 13:35:36 -04:00
Isaac Connor
acd63ee0d8 Don't assuming we want to communicate with zms if streaming. 2022-05-11 10:21:44 -04:00
Isaac Connor
997c1197cf Implement decoding=Keyframes + OnDemand 2022-05-10 14:25:34 -04:00
Isaac Connor
84ae91fe24 Comment out width and height setting on the imageFrame 2022-04-28 15:45:35 -04:00
Isaac Connor
1eaeccc564 Handle zones not being set in options 2022-04-19 12:31:43 -04:00
Isaac Connor
7b5ee86ee8 Move svg zone display into Monitor->getStreamHTML. Remove most of it because scaling is now automatic. Move styling to css 2022-04-10 18:54:01 -04:00
Isaac Connor
e8391ad0be Move collapsed status to Monitor.php and put back setting width and height on the monitorStream container. 2022-04-10 17:28:38 -04:00
Isaac Connor
723c10ca19 Cleanup options, add DecodingOptions 2022-03-28 17:45:01 -04:00
Isaac Connor
23aa41091f Add Trigger/etc to onMotion recording option 2022-03-20 19:13:46 -04:00
Isaac Connor
0c31e35b4e Add classes to fields of monitor status so we can style them as needed 2022-03-04 12:06:49 -05:00
Isaac Connor
13251b133a Make getMonitorCapturingOptions a member of the class, so can call it getCapturingOptions. Same with Analysing and Recording options 2022-02-27 14:03:37 -05:00
Isaac Connor
f66a463574 Merge branch 'master' into replace_function_concept 2022-02-08 12:07:30 -05:00
Isaac Connor
aad79d3407 Rename MonitorAnalysingOptions => AnalysingOptions as they will have to be prefixed with module name anyways. 2022-02-08 11:19:36 -05:00
Isaac Connor
69053424cd When adding a new monitor, ModelId and ManufacturerId are not defined, so handle that 2022-02-06 19:06:35 -05:00
Isaac Connor
bd68b9e3af Not ready for OutputSource yet 2022-02-02 17:10:05 -05:00
Isaac Connor
10e39b3b13 :wqMerge branch 'master' into replace_function_concept 2022-02-02 17:08:01 -05:00
Isaac Connor
23bfbcd6ce Merge branch 'master' into multistream 2022-01-26 10:13:20 -05:00
Jonathan Bennett
ec9403fb6f Adds Amcrest On-camera Motion Detection 2022-01-25 22:38:00 -06:00
Isaac Connor
a57206ef54 Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js 2022-01-20 09:47:36 -05:00
Jonathan Bennett
fb832e7d1b Adds janus_enable_audio, a switch to try to enable audio in live stream viewing. 2022-01-19 00:14:52 -06:00
Isaac Connor
3835087c9d Merge branch 'master' into multistream 2022-01-18 20:16:08 -05:00
Jonathan Bennett
3a9c16aeea First working Janus build 2022-01-10 23:22:37 -06:00
Isaac Connor
fd3a70172d Merge branch 'master' into multistream 2022-01-10 17:51:50 -05:00
Jonathan Bennett
1333d8c751 Adds ONVIF Motion Detection Support 2022-01-06 16:45:15 -06:00
Isaac Connor
6bd04de5f6 Merge branch 'master' into multistream 2021-12-31 17:53:36 -05:00
Isaac Connor
21218491f7 Add EventStartCommand and EventEndCommand to monitors ui 2021-11-26 19:22:07 -05:00
Isaac Connor
98e29e7ef6 implement UrlToZMS in Monitor 2021-11-12 15:11:48 -05:00
Isaac Connor
fb67c6a3e7 Add defaults for Capturing, Analysing, Recording 2021-10-25 16:53:42 -04:00
Isaac Connor
8d1c45162d Add functions to return options for Capturing, Analysing, AnalysisSource, Recording, RecordingSource 2021-10-16 20:35:11 -04:00
Isaac Connor
7ca7d40b6f Add defaults for ModelId and ManufacturerId. Fixes the methods for loading them 2021-09-25 10:32:04 -04:00
Isaac Connor
227e5794fa Merge branch 'master' into add_manufacturer_model_to_monitors 2021-09-08 18:32:46 -04:00
Isaac Connor
b2415643f6 Add missing Importance member 2021-09-08 13:57:46 -04:00
Isaac Connor
eb1124c406 Spacing and quotes 2021-08-18 10:53:59 -04:00
Isaac Connor
301d8fa5fa Change monitor->canView semantics so that a specified monitorId trumps the Monitors:None setting. This is so that the console can be hidden, but the group dropdown still gets populated. 2021-08-18 10:53:59 -04:00
Isaac Connor
3bb2b804b3 Include Model and Manufacturer to includes in Monitor.php 2021-07-07 09:46:36 -04:00
Isaac Connor
096581b7f1 add getMonitorStatuses function to return string values for status numbers 2021-05-28 12:29:30 -04:00
Isaac Connor
9254c99ab8 Add ModectDuringPTZ 2021-04-23 14:52:29 -04:00
Isaac Connor
3335976cba implement remote api Trigger support. 2021-04-12 15:59:31 -04:00
Isaac Connor
1b50314f9e Add DisableAlarms function 2021-04-12 15:59:31 -04:00
Isaac Connor
3dcb71933e Add event summary fields to Monitor Object 2021-04-09 19:46:25 -04:00
Isaac Connor
7e3d6f867e Set the default crf so that encoding works 2021-04-01 11:53:57 -04:00
Isaac Connor
beb7a75d5a Implement canView for Monitors 2021-03-30 11:52:04 -04:00
Isaac Connor
8e1b2ccbc7 Add MaxImageBufferCount 2021-03-26 17:02:17 -04:00
Isaac Connor
c347261e19 Change default of ImageBufferCount to 3 2021-03-22 12:05:36 -04:00
Isaac Connor
6682ec7da5 Add Snapshots and Snapshot_Events Tables. Add HomeView to Users. 2021-03-12 09:26:23 -05:00