fc5e53d00f
Fix: Broken channel switching (MonitorStream.js)
...
You can't use "!streamChannel" in the condition, because "streamChannel = 0" will be true.
That is, we have channel 0 and channel 1.
In this case, if you don't pass anything to the "MonitorStream.start" method, then the default channel specified in the monitor settings is used.
If we want to use channel 0, we call it like this:
MonitorStream.start(0)
If the first one, then like this:
MonitorStream.start(1)
If the default one from the monitor settings, then like this:
MonitorStream.start()
2025-07-23 00:02:12 +03:00
7cffc34e79
Set default background colour for monitors on montagereview to black since we use white text
2025-07-22 16:49:43 -04:00
6427511109
Add IN support to api
2025-07-22 16:49:23 -04:00
71580f761c
MontageReview: Fix the things I broke merging the left menu stuff. Some cleanups/efficiency improvements.
2025-07-22 16:49:06 -04:00
ea11065c77
Merge branch 'ZoneMinder:master' into patch-771054
2025-07-22 21:10:10 +03:00
0268474974
Remove debug, improve logged message when fonts take too long to load
2025-07-22 14:02:22 -04:00
70e676575f
Use boolean instead of integer for LOADING. Improve debugging when event not found, add a comment explaining why event_list.
2025-07-22 13:42:54 -04:00
f513470f94
Merge pull request #4347 from IgorA100/patch-534527
...
Now we build the Options submenu in only one place and using the "ZM_Menu" class
2025-07-22 13:21:29 -04:00
729cec5462
Add chosen to stream quality so it looks the same as other drop downs
2025-07-22 13:13:01 -04:00
8be098cb89
Remove player stuff from streamMode as it doesn't belong.
2025-07-22 13:03:38 -04:00
835a3d74e3
Revert "Remove getStreamMode which was actually getPlayer and should just be replaced by a monitor field for defaultPlayer."
...
This reverts commit c05ee7e43c
2025-07-22 13:02:43 -04:00
0a820a9354
Moved "observer" to global scope and renamed to "observerMontage" (montage.js)
2025-07-22 19:39:22 +03:00
afeeb5dca0
When using go2rtc, perform an Observe on the newly created <video-stream> element (MonitorStream.js)
2025-07-22 19:34:14 +03:00
ce5535d468
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-22 09:39:14 -04:00
2d6c8e39e8
Fix use of useOldMenuView
2025-07-22 08:41:18 -04:00
6cc71ad238
Merge pull request #4374 from IgorA100/patch-584109
...
Fix: Correctly close go2rtc stream when executing "stop" command (MonitorStream.js)
2025-07-22 08:02:57 -04:00
c5047ac667
Use validHtmlStr on cookie name in case someone is stupid
2025-07-21 18:32:14 -04:00
f543087c4b
Add cookie to StartDateTime filters
2025-07-21 18:28:49 -04:00
0f40b28d3b
We don't need a delay when stopping (MonitorStream.js)
...
The delay is used in the VideoRTC.disconnectedCallback() method
Alternatively, you can add an optional argument "immediately" to the disconnectedCallback() method, but I did not edit video-rtc.js
2025-07-21 23:57:08 +03:00
c758aa6889
Correctly close go2rtc stream when executing "stop" command (MonitorStream.js)
...
This should be enough.
2025-07-21 23:40:40 +03:00
74290ca416
Fix incomplete change
2025-07-21 10:35:25 -04:00
7c6aa9e539
Fix eslint
2025-07-21 10:17:25 -04:00
911f30a5e1
Merge pull request #4370 from IgorA100/patch-130735
...
Fix: Correct switching of players on Watch page
2025-07-21 09:27:57 -04:00
ec7de86d2f
Instead of using getStreamMode, just default to '' which means auto.
2025-07-21 08:06:51 -04:00
c05ee7e43c
Remove getStreamMode which was actually getPlayer and should just be replaced by a monitor field for defaultPlayer.
2025-07-21 08:06:51 -04:00
b2e0d696ba
Revert "if" (MonitorStream.js)
2025-07-21 12:47:31 +03:00
e8ef6d729e
Stream stopping fix for RTSP2Web and Go2Rtc (MonitorStream.js)
...
Flow stops for Go2Rtc require further adjustment.
2025-07-21 11:21:06 +03:00
34d01f098d
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-20 18:39:53 -04:00
661cc59a16
If header=0 or header=hidden is in the request, hide the header, allowing more kiosk-like view
2025-07-20 16:06:12 -04:00
52ad52da16
Make elements of the PTZ panel 100% so that centering works
2025-07-20 16:06:12 -04:00
33392c2a27
Add class attributes for remaining li elements
2025-07-20 14:32:22 -04:00
fcfc58e6a8
Don't change "src" attribute when using RTSP2Web (MonitorStream.js)
2025-07-20 11:52:51 +03:00
51c2083ef6
Returned the conditions as they were before (MonitorStream.js)
2025-07-20 11:33:59 +03:00
3c8c56dcc2
Using deleteBtn for the name interferes with the actual deleteBtn on console
2025-07-19 19:38:18 -04:00
d390369f5e
Only do ai detection tagging if we have nlohmann_json
2025-07-19 19:14:42 -04:00
394f90fb1f
Update MonitorStream.js
2025-07-20 02:01:49 +03:00
4c5bae17d7
Make nlohmann_json optional
2025-07-19 19:00:17 -04:00
3c744084c2
Remove Timeout and perform "reject()" immediately at the moment of unsuccessful attempt to delete MSE buffer (MonitorStream.js)
2025-07-20 01:56:46 +03:00
09c2463f70
Fix: Correct switching of players (MonitorStream.js)
...
- When changing the player, set the correct value in "this.RTSP2WebType"
- Incorrect placement of brackets in the conditions when starting a stream
- When stopping "webrtc", clear "stream.srcObject"
- When executing ".stopMse", limit the promise wait time to 500ms and, in case of failure, execute reject()
2025-07-20 01:33:56 +03:00
d5e81d3c4a
Fix incorrect use of eventObjas an array.
2025-07-19 18:29:22 -04:00
79c7f0744b
Merge branch 'ZoneMinder:master' into patch-130735
2025-07-20 01:24:51 +03:00
4dfa260458
Fix eslint
2025-07-19 17:08:44 -04:00
acce1217b3
Only do Rtsp2Web resyncing if we are using rtsp2web. Fixes restarts with go2rtc
2025-07-19 16:59:20 -04:00
283b62a3bf
Fix format string for size_t
2025-07-19 16:58:29 -04:00
0306939cb9
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-19 16:54:58 -04:00
97d7c1c7a5
Trim any trailing / from storage path. Can cause problems
...
Fixes #4371 ?
2025-07-19 16:54:51 -04:00
ad372c9d65
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-19 14:19:03 -04:00
4757d711ef
Change various cases of int img_buffer_size to size_t
2025-07-19 14:18:32 -04:00
5187422899
Fix: Always load hls.js library (watch.php)
...
Because now we switch players "on the fly"
2025-07-19 19:51:44 +03:00
4043c02d51
Clear img/src before calling stop so that we don't try to load a still image in kill
2025-07-18 18:23:36 -04:00
IgorA100
Isaac Connor
Isaac Connor