Commit Graph

236 Commits

Author SHA1 Message Date
Isaac Connor
b3f1d5cfe7 When coming back from AYSW, maybe img.src == new src. Just set it and send a PLAY for good measure 2025-08-18 15:52:13 -04:00
Isaac Connor
b64351b3e1 Fix streams not restarting because player='' auto and we need to be looking at activePlayer 2025-08-18 15:14:49 -04:00
Isaac Connor
f047176378 Merge pull request #4394 from IgorA100/patch-896443
Feat: New design of the audio stream control slider
2025-08-09 11:58:14 -04:00
Isaac Connor
ada08701bf Merge branch 'master' of github.com:ZoneMinder/zoneminder 2025-08-07 12:24:14 -04:00
Isaac Connor
e16679b4b1 Make ZMS MJPEG vs go2rtc mjpeg more clean. Don't set img.src to single mode, just send STOP. Send QUIT in kill(). 2025-08-07 12:24:11 -04:00
IgorA100
d4ba17c919 Fix: When executing the "streamCmdReq" command, check "activePlayer" instead of "RTSP2WebEnabled" and "Go2RTCEnabled" (MonitorStream.js) 2025-08-07 18:40:07 +03:00
IgorA100
6804761ad9 When quickly switching between cameras on the Watch page, the audioStream may not yet exist (MonitorStream.js) 2025-08-07 12:25:42 +03:00
IgorA100
47f593317d When quickly switching between cameras on the Watch page, the audioStream may not yet exist (MonitorStream.js) 2025-08-07 12:19:37 +03:00
IgorA100
a16143aae9 Fix: Check for existence of "this.webrtc" before checking "close" method (MonitorStream.js)
In addition to #4407
Otherwise, there may be an error when switching start/stop quickly.
2025-08-05 19:02:06 +03:00
IgorA100
5f6db1fda6 Merge branch 'ZoneMinder:master' into patch-896443 2025-08-05 16:09:56 +03:00
IgorA100
c962575d90 Fix: Correct stop of go2rtc. It is required to close the stream, not just disconnect (MonitorStream.js)
Otherwise, the stream may remain alive and there will be problems when switching players and parasitic network traffic is possible.
2025-08-05 12:33:34 +03:00
IgorA100
87796632bf Merge branch 'master' into patch-896443 2025-08-04 19:19:12 +03:00
Isaac Connor
8e46bc0933 Merge pull request #4397 from IgorA100/patch-552676
Fix: Change stream channel for Player=Auto on Watch page
2025-08-04 12:09:44 -04:00
IgorA100
34c62f538c Update MonitorStream.js 2025-08-03 12:02:20 +03:00
IgorA100
9f35ad6b53 Added method "updateStreamInfo()" (MonitorStream.js) 2025-08-03 12:00:35 +03:00
IgorA100
d2a51e77fc When stopping, check MonitorStream.activePlayer instead of MonitorStream.player(MonitorStream.js)
This is due to the fact that in the "Auto" mode, MonitorStream.player will be empty!!!
2025-08-03 00:33:00 +03:00
IgorA100
c6efacd3b3 Update MonitorStream.js 2025-08-02 12:44:36 +03:00
IgorA100
6fe174ab4d Merge branch 'master' into patch-896443 2025-08-01 14:01:51 +03:00
IgorA100
b01cbd97d7 Fix: Actions when pressing the Play and Pause buttons (MonitorStream.js)
Since we can now change the player type on the viewing page, we need to analyze "MonitorStream.activePlayer" instead of "MonitorStream.RTSP2WebEnabled" and "MonitorStream.Go2RTCEnabled"
2025-07-30 20:03:02 +03:00
IgorA100
430a591ede Fix: eslint 2025-07-30 12:50:40 +03:00
IgorA100
068533616a Fix: Eslint 2025-07-30 12:47:15 +03:00
IgorA100
8a7f703fe5 Merge branch 'ZoneMinder:master' into patch-896443 2025-07-30 12:11:43 +03:00
IgorA100
b28d6e2a7d Fix: If "Janus" is disabled in the monitor settings, then set disabled in the list of players on the Watch page (MonitorStream.js) 2025-07-30 01:21:04 +03:00
IgorA100
68e98fc55c Merge branch 'ZoneMinder:master' into patch-896443 2025-07-30 00:43:26 +03:00
IgorA100
fb4c1fbbf7 Code optimization 2025-07-29 23:54:19 +03:00
IgorA100
1be91c2e55 Event listener "click" for buttons with "id=^controlMute" move to skin.js 2025-07-29 20:57:54 +03:00
IgorA100
f309d194f6 More correct stopping of the Janus player (MonitorStream.js) 2025-07-29 17:57:59 +03:00
IgorA100
602d658642 Code for controlling the new audio stream control slider (MonitorStream.js) 2025-07-29 17:33:46 +03:00
Isaac Connor
8f8abb70d2 Handle option not existing and so referencing .disabled fails 2025-07-26 12:21:54 -04:00
Isaac Connor
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
Isaac Connor
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
IgorA100
9497938f5d Fix: Removed excessive logging, we use it only for debugging (MonitorStream.js) 2025-07-25 21:10:41 +03:00
IgorA100
6d24ad8cfa Fix: RTSP2Web after closing "RTCPeerConnection" browser should not try to get object (MonitorStream.js) 2025-07-25 20:52:05 +03:00
IgorA100
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
IgorA100
42607c84d5 Missing semicolon (MonitorStream.js) 2025-07-25 14:16:55 +03:00
IgorA100
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
IgorA100
989b4a8628 Fix: Missing semicolons (MonitorStream.js) 2025-07-24 23:50:35 +03:00
IgorA100
8da9cb3ba7 We will now manage player availability here (MonitorStream.js) 2025-07-24 23:41:49 +03:00
IgorA100
69a72700b9 Merge branch 'ZoneMinder:master' into patch-784062 2025-07-24 23:39:37 +03:00
IgorA100
ccaf00f842 Avoid JS errors when stopping go2rtc stream unsuccessfully (MonitorStream.js) 2025-07-24 19:00:24 +03:00
IgorA100
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
IgorA100
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
IgorA100
e588ad4e7a Support switching between Primary & Secondary streams (MonitorStream.js)
To #4381
2025-07-23 18:10:01 +03:00
Isaac Connor
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
IgorA100
c683b14a89 Fix: tabs->space (MonitorStream.js) 2025-07-23 00:49:10 +03:00
IgorA100
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
IgorA100
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
IgorA100
afeeb5dca0 When using go2rtc, perform an Observe on the newly created <video-stream> element (MonitorStream.js) 2025-07-22 19:34:14 +03:00
IgorA100
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
IgorA100
c758aa6889 Correctly close go2rtc stream when executing "stop" command (MonitorStream.js)
This should be enough.
2025-07-21 23:40:40 +03:00