Commit Graph

128 Commits

Author SHA1 Message Date
Isaac Connor
1de8d76cae Remove debug of forceAlarmButton 2024-10-29 13:31:11 -04:00
Isaac Connor
ce1a1b87e9 Only try to send a command to enable analysis frames if we are streaming through zms. prevents an error being logged 2024-10-22 16:18:31 -04:00
Isaac Connor
c2fe3ce1e8 Fix eslint 2024-10-15 18:10:05 -04:00
Isaac Connor
e306dcf972 Merge pull request #4163 from IgorA100/patch-180200
Chore: Removed the use of the "delay" constant as it is no longer used when starting monitors on the Montage page
2024-10-03 06:51:14 -04:00
IgorA100
5790a0d03b Recovered spaces that I accidentally deleted (MonitorStream.js) 2024-10-02 19:35:54 +03:00
IgorA100
701d485773 Removed the "delay" argument from the "start" function as it is no longer used (MonitorStream.js) 2024-10-02 19:33:37 +03:00
IgorA100
8843d8c18a Fix: Restored monitors start with delay (MonitorStream.js)
Probably it broke at some point. Or maybe it never worked, but in montage.js monitors start with a delay:
"monitor.start(delay);"
2024-10-02 13:37:05 +03:00
Isaac Connor
35f2dee620 add setGridStack. Rework logic on enable/disable motion anf force/cancel alarm to match when using rtsp2web. Add support for score and analysing in status response. 2024-10-01 17:13:30 -04:00
Isaac Connor
53ffcd4121 In play/pause, start/stop rtsp2web as well as zms stream. Also stop status requests. Rework the enable/disable alarms and force alarm buttons when using rtsp2web. 2024-09-25 14:54:58 -04:00
Isaac Connor
2ca08fb546 Track started state for RTSP2Web and Janus as well 2024-09-06 09:33:55 -04:00
Isaac Connor
1e4bb4798e Update auth in zms url when scaling as it may have been running for a while and need updating 2024-08-22 14:57:28 -04:00
Isaac Connor
37e7da4dfa Don't keep our own copy of auth credentials. Use the global ones. When getting new auth from status request, update auth_relay as well. 2024-07-30 09:54:37 -04:00
Isaac Connor
43e21a3200 Update auth_hash in zms url 2024-06-28 14:33:59 -04:00
Isaac Connor
22f3910953 Use statusRefreshTimeout instead of delay on status requests. If new auth info is found in statusresponse, use it. 2024-06-06 18:10:53 -04:00
IgorA100
7d86df0c04 Chore: eslint MonitorStream.js 2024-05-31 01:04:03 +03:00
IgorA100
5706bf2ade Added $streamQuality processing (MonitorStream.js) 2024-05-31 00:51:49 +03:00
Isaac Connor
662fc2baf2 Turn on use strict 2024-05-29 10:26:42 -04:00
Isaac Connor
4a0ea62fa6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2024-05-29 10:10:54 -04:00
Isaac Connor
878c8a7687 In kill, turn the url from a streaming url into a single so as to actually stop the stream. 2024-05-29 10:10:36 -04:00
IgorA100
ca40a794d2 Added this.started = true/false when starting/stopping the monitor (MonitorStream.js) 2024-05-29 17:06:33 +03:00
Isaac Connor
69d5855653 Add another decimal digit to fps displays 2024-05-28 10:11:02 -04:00
IgorA100
f0b13f0c11 Fix: function "this.setMaxFPS" (MonitorStream.js)
The function didn't work!
The parameter "maxfps" was passed to the function, and "currentSpeed" was passed to "streamCommand" instead of "maxfps"
2024-05-27 22:58:41 +03:00
Isaac Connor
9f730bc0d7 Immediately do a status command when the image loads instead of waiting statusInterval for it. 2024-05-16 15:57:50 -04:00
IgorA100
d72303de48 Fix: eslint (MonitorStream.js) 2024-05-09 20:51:46 +03:00
IgorA100
418a18d59d Changed the "setScale" function to support PanZoom on Montage & Watch page (MonitorStream.js)
\views\js\montage.js is affected
2024-05-09 20:14:16 +03:00
Isaac Connor
4b596b70f3 Fix eslint 2024-05-08 16:22:36 -04:00
IgorA100
a809a92d1f Chore: eslint MonitorStream.js 2024-05-07 20:50:34 +03:00
IgorA100
6d4e6fd401 Added the ability to disable image resizing when changing Scale (MonitorStream.js)
Required when using GridStack & PanZoom on Montage page
2024-05-07 20:23:00 +03:00
IgorA100
d9e12a2e68 Fix: IMG width is now 100% instead of "auto" 2024-04-09 13:16:03 +03:00
IgorA100
d7ae0d9d23 Feat: Mouse moving an enlarged video frame during live viewing
Added mouse movement tracking functions.
2024-04-01 12:56:14 +03:00
IgorA100
a18167377e Fix: scaleToFit function
It is required to pass an object in parameters
2024-03-04 16:52:04 +03:00
Isaac Connor
8ca1436224 If img has a fix width set, clear it when we change scale 2024-01-24 12:54:13 -05:00
Isaac Connor
6ba09c6f0d Finish switch to using Intervals instead of Timeouts 2024-01-24 09:28:12 -05:00
Isaac Connor
bd90711aa6 Use an interval instead of calling Timeout from callback 2024-01-22 14:25:57 -05:00
Isaac Connor
6812f2efe7 Fix eslint 2024-01-16 09:56:28 -05:00
Isaac Connor
ee9e03a7c1 Fix FPS values when getting status from web instead of ZMS. 2024-01-02 16:28:49 -05:00
Isaac Connor
88db0e9854 Handle when ZM_RTSP2WEB_PATH hasn't been filled, but RTSP2Web has been turned on for a monitor. 2023-12-07 13:17:08 -05:00
Isaac Connor
07d4fb2099 Set default delay, add starting statusCmdTimer when using rtsp2web 2023-11-21 11:35:04 -05:00
Isaac Connor
ea76a03043 Rename startRTSPtoWebRTSPPaly to startRTSPtoWebPlay 2023-10-15 17:55:44 -04:00
Isaac Connor
93f5378f4e Fix undefined reference to startPlay 2023-10-15 17:55:44 -04:00
Isaac Connor
1e200abf16 Remove support for browsers not supporting TextDecoder to fix eslint 2023-08-08 13:01:42 -04:00
Jonathan Bennett
80c145dca4 Add support for HTTPS connections to RTSP2Web 2023-07-31 00:16:51 -05:00
Jonathan Bennett
af42398070 Fix ESLint issues in RTSP2Web work 2023-07-30 16:54:22 -05:00
Jonathan Bennett
5c9588c012 Adds RTSP2Web support for live view 2023-07-29 23:46:31 -05:00
Isaac Connor
e96d2a6acc No longer abort when sending a command... no streaming ajax should take any significant time. 2023-07-11 17:27:52 -04:00
Isaac Connor
14eb38a00b add timeout value to debug, only send scale command if it is > 0 2023-06-08 10:30:01 -04:00
Isaac Connor
4f416edf93 Fix missing auth_relay on alarm xhr 2023-06-05 09:57:12 -04:00
Isaac Connor
31d9342918 Assume reverse proxy setup for janus for http as well 2023-05-31 17:01:45 -04:00
Isaac Connor
9a13312e4e Fix eslint 2023-05-25 14:15:32 -04:00
Isaac Connor
d0fead5b06 Add setMaxFPS and fix streamCommand so that data doesn't pollute other commands data 2023-05-12 14:10:52 -04:00