Skip to content

Conversation

IgorA100
Copy link
Contributor

@IgorA100 IgorA100 commented Jul 24, 2025

Now the selected channel is saved in cookies.
But the saved channel is applied to any monitor, not to a specific one. Let it be like this for now. It's better than what's happening now with the collapse....
Later, a new solution will need to be developed.
You can also pass the channel in the browser line via streamChannel=0 или streamChannel=secondary

The "RTSP2WebStream" setting is now visible for both RTSP2Web and Go2RTC
Probably, in the future it is necessary to rename "RTSP2WebStream" for example to "StreamSource"

Closed #4373 #4381

IgorA100 added 4 commits July 24, 2025 15:53
…RTC (monitor.js)

Probably, in the future it is necessary to rename "RTSP2WebStream" for example to "StreamSource"
…ser 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()
…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
…hannel value and a string, including an empty one. (MonitorStream.js)
@IgorA100
Copy link
Contributor Author

For Montage page everything is a bit more complicated...
Now the channel is also taken from cookies saved on Watch page. I think this is not correct and it should be done as it was before, i.e. the channel should be taken from monitor settings.
Do you agree?
I am not ready to implement the channel switch on Montage page yet, there are many nuances there...

@IgorA100 IgorA100 marked this pull request as draft July 24, 2025 13:46
…tings, as it was before (MonitorStream.js)

Added support for streamChannel = 'default' for Go2RTC
@IgorA100 IgorA100 marked this pull request as ready for review July 24, 2025 13:51
@IgorA100
Copy link
Contributor Author

Now the Montage page uses the channel specified in the monitor, including for go2rtc

@IgorA100 IgorA100 marked this pull request as draft July 24, 2025 16:48
IgorA100 added 3 commits July 24, 2025 20:09
…evious monitor that the current monitor does not have. (watch.js)

And renamed manageRTSP2WebChannelStream() function to manageChannelStream()
@IgorA100
Copy link
Contributor Author

I added a channel stream check when switching to another monitor.
If the channel is not available at the monitor, the primary channel will be used

There is still a lot of work to do related to switching players and channels, but I think it is worth considering this PR and then systematically making other changes.

@IgorA100 IgorA100 marked this pull request as ready for review July 24, 2025 17:27
@IgorA100 IgorA100 marked this pull request as draft July 24, 2025 20:09
@IgorA100 IgorA100 marked this pull request as ready for review July 24, 2025 20:42
@IgorA100
Copy link
Contributor Author

I made the players switch when selecting the next/previous camera, as you wanted.
Closed #4373

@IgorA100
Copy link
Contributor Author

Now I have definitely completed this PR :)

@IgorA100 IgorA100 marked this pull request as draft July 25, 2025 10:39
@IgorA100 IgorA100 marked this pull request as ready for review July 25, 2025 11:14
@IgorA100
Copy link
Contributor Author

It seems like all switching now works correctly.

IgorA100 and others added 3 commits July 25, 2025 15:29
… uses translation

'PlayerDisabledInMonitorSettings'  => 'The player is disabled in the monitor settings.',
@connortechnology connortechnology merged commit fd53d34 into ZoneMinder:master Jul 25, 2025
16 of 19 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

When cyclically viewing, available players are not updated when switching to the next or previous camera.
2 participants