1591df91b5
Merge pull request #4390 from IgorA100/patch-32796
...
Fix: RTSP2Web after closing "RTCPeerConnection" browser should not try to get object (MonitorStream.js)
2025-07-25 16:42:45 -04:00
6cf3a3e174
Merge pull request #4391 from IgorA100/patch-684425
...
Fix: Removed excessive logging, we use it only for debugging (MonitorStream.js)
2025-07-25 16:42:06 -04:00
fd53d34933
Merge pull request #4383 from IgorA100/patch-784062
...
Fix: More correct switching of stream channels for RTSP2Web and Go2RTC with saving the selection in cookies on Watch page
2025-07-25 16:39:42 -04:00
9497938f5d
Fix: Removed excessive logging, we use it only for debugging (MonitorStream.js)
2025-07-25 21:10:41 +03:00
6d24ad8cfa
Fix: RTSP2Web after closing "RTCPeerConnection" browser should not try to get object (MonitorStream.js)
2025-07-25 20:52:05 +03:00
36898bb2b2
Apply "chosen" for <select>(watch.php)
2025-07-25 18:10:01 +03:00
dcb68c633c
Don't wrap "label" separately from "select" to a new line (watch.css)
2025-07-25 18:02:28 +03:00
b39bf32504
Run applyChosen() (watch.js)
2025-07-25 17:12:33 +03:00
06ae94d649
Fix: Don't apply "chosen" to hidden objects ('.hidden, .hidden-shift') (skin.js)
2025-07-25 17:09:14 +03:00
019409705f
When changing the player after stopping the stream, a delay is required before starting (watch.js)
2025-07-25 15:50:28 +03:00
042496e9f2
The tooltip about player unavailability in <select> on Watch page now uses translation
...
'PlayerDisabledInMonitorSettings' => 'The player is disabled in the monitor settings.',
2025-07-25 15:29:25 +03:00
a88ac3679a
Fix: eslint (watch.js)
2025-07-25 14:20:11 +03:00
42607c84d5
Missing semicolon (MonitorStream.js)
2025-07-25 14:16:55 +03:00
a01a06bd4d
Added the variable "activePlayer". It is necessary to understand which player is used in the "Auto" mode (MonitorStream.js)
2025-07-25 14:01:20 +03:00
3356c0635f
Correct switching of players and stream channels (watch.js)
2025-07-25 13:56:41 +03:00
385ae52f2f
Add Deleting Event_Data
2025-07-24 17:43:38 -04:00
989b4a8628
Fix: Missing semicolons (MonitorStream.js)
2025-07-24 23:50:35 +03:00
8da9cb3ba7
We will now manage player availability here (MonitorStream.js)
2025-07-24 23:41:49 +03:00
69a72700b9
Merge branch 'ZoneMinder:master' into patch-784062
2025-07-24 23:39:37 +03:00
ab508746fc
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2025-07-24 16:23:59 -04:00
3b24de2fdd
Make failure to open audio non-fatal. Also Fix the check sample fmts code, AAC only supports fltp... so just default to fltp like we used to. Fixes #4363
2025-07-24 16:23:51 -04:00
289a8b9ae7
We will now manage player availability from JS (watch.php)
...
Here we collect <select> with all players
2025-07-24 23:12:40 +03:00
864c70537e
Missing semicolon (watch.js)
2025-07-24 20:29:21 +03:00
4784bf0025
Fix: When switching monitors, cookies may store a channel from the previous monitor that the current monitor does not have. (watch.js)
...
And renamed manageRTSP2WebChannelStream() function to manageChannelStream()
2025-07-24 20:23:43 +03:00
6f21ac6e6e
Renamed manageRTSP2WebChannelStream() function to manageChannelStream() (monitor.js)
2025-07-24 20:14:34 +03:00
b232daf076
Merge pull request #4384 from IgorA100/patch-14341
...
Fix: Avoid JS errors when stopping go2rtc stream unsuccessfully (MonitorStream.js)
2025-07-24 13:12:15 -04:00
97bd5d90ba
Renamed manageRTSP2WebChannelStream() function to manageChannelStream() (skin.js)
2025-07-24 20:09:27 +03:00
ccaf00f842
Avoid JS errors when stopping go2rtc stream unsuccessfully (MonitorStream.js)
2025-07-24 19:00:24 +03:00
bded13752c
On Montage page StreamChannel is now always used from the monitor settings, as it was before (MonitorStream.js)
...
Added support for streamChannel = 'default' for Go2RTC
2025-07-24 16:50:46 +03:00
e00f8dc24b
The MonitorStream.start() method can now be passed both a numerical channel value and a string, including an empty one. (MonitorStream.js)
2025-07-24 16:24:04 +03:00
b2f7911bec
The start of the stream now always occurs with the indication of the channel (watch.js)
...
Switching the visibility of the StreamQuality and StreamChannel selectors has been moved to a separate function manageStreamQualityVisibility() taking into account the current player
The selected streamChannel is saved in cookies
2025-07-24 16:19:28 +03:00
e474bf9c5e
Added support for streamChannelSelected from session cookies and browser string (watch.php)
...
If this parameter is not found in session cookies or browser string, then the default from monitor settings is applied.
streamQualitySelected is now processed via validHtmlStr()
2025-07-24 16:07:50 +03:00
0831913341
The "RTSP2WebStream" setting is now visible for both RTSP2Web and Go2RTC (monitor.js)
...
Probably, in the future it is necessary to rename "RTSP2WebStream" for example to "StreamSource"
2025-07-24 15:53:20 +03:00
25ffe38c66
Merge branch 'patch-711585' of github.com:IgorA100/zoneminder into go2rtc_second_stream
2025-07-23 15:30:00 -04:00
fda9d90e8f
Implement CURL_PUT, move CURL *curl into each function. When a second stream is present, add it as well.
2025-07-23 15:29:42 -04:00
49e11855d6
Store error reason so it doesn't get clobbered by second attempt.
2025-07-23 13:25:43 -04:00
e588ad4e7a
Support switching between Primary & Secondary streams (MonitorStream.js)
...
To #4381
2025-07-23 18:10:01 +03:00
0e80dd17af
Fix eslint
2025-07-23 09:38:44 -04:00
a013845275
Merge pull request #4380 from IgorA100/patch-109758
...
Fix: Added support for double-clicking on a stream to go into fullscreen mode when using go2rtc
2025-07-23 09:35:41 -04:00
2226153aec
Fix: Added support for double-clicking on a stream to go into fullscreen mode when using go2rtc (skin.js)
2025-07-23 16:27:16 +03:00
783974c4b4
Merge pull request #4376 from IgorA100/patch-771054
...
Fix: Run ResizeObserver for Go2RTC on Montage page
2025-07-22 19:46:22 -04:00
e102f6f85d
Merge pull request #4378 from IgorA100/patch-55208
...
We do not use the document hiding/showing analysis from "video-rtc.js", because we have our own analysis (MonitorStream.js)
2025-07-22 19:43:44 -04:00
c683b14a89
Fix: tabs->space (MonitorStream.js)
2025-07-23 00:49:10 +03:00
de57d830e4
We do not use the document hiding/showing analysis from "video-rtc.js", because we have our own analysis (MonitorStream.js)
2025-07-23 00:47:23 +03:00
f2ac22dde2
Merge pull request #4377 from IgorA100/patch-642046
...
Fix: Broken channel switching (MonitorStream.js)
2025-07-22 17:04:06 -04:00
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
Isaac Connor
IgorA100
IgorA100
Isaac Connor