Isaac Connor
010959c9d4
fix: only show monitor edit button if user has edit permission
...
The edit button overlay on the montage view stream is now conditionally
displayed based on the user's edit permission for that monitor.
Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com >
2026-01-29 13:56:03 -05:00
Ben Dailey
c80542343a
Remove Preview Rate Control. Disable BuiltIn Video controls.
2026-01-29 11:18:30 -05:00
Isaac Connor
e6c5bdb85d
Use modern string interpolation style
2025-12-22 19:43:05 -05:00
Isaac Connor
254fd58c40
Use css style= to set width of video tag, and if height is specified, also set it. Fixes streams not having height.
2025-12-19 12:03:29 -05:00
Isaac Connor
6c2ad8d906
Use the same code for ImageStill and for ImageStream. Use ImageStream when mode == paused. Fixes #4491
2025-12-19 11:10:32 -05:00
Isaac Connor
736610d349
Simplify monitor state html, mostly to include the stream-info into the part that gets hidden with the other state info
2025-10-29 12:15:32 -04:00
Isaac Connor
9932c1f690
Add missing EncoderHWAccel fields
2025-10-27 09:40:06 -04:00
Isaac Connor
ecd37ae6c7
Revert change to assign 4 streams per port. It caused more trouble than it was worth
2025-10-16 12:13:53 -04:00
Isaac Connor
83800e8753
Test for existend of type in defaults to avoid warning
2025-10-10 13:26:57 -04:00
Isaac Connor
b5a10ca1ce
Add +1 because we will now use 30000 instead of 30001.. so some existing configs may break.
2025-10-09 11:01:08 -04:00
Isaac Connor
1fc27261e1
Add initial_scale property
2025-10-07 21:02:30 -04:00
Isaac Connor
e04d38f83e
When using MIN_SPREAMING_PORT, divide by 5 so we get 5 streams per port
2025-10-01 21:01:29 -04:00
Isaac Connor
3373fb71aa
Simply zms option let's just assume that that we can stream
2025-09-25 17:36:13 -04:00
Isaac Connor
fe323e0aff
Add DefaultPlayer support in getStreamSrc
2025-09-24 14:05:58 -04:00
Isaac Connor
063ec36106
Add DefaultPlayer to Monitor object
2025-09-24 09:54:19 -04:00
Isaac Connor
edf87d6463
Move stream-info off the video stream down to where the monitor status info is.
2025-09-05 09:35:53 -04:00
Isaac Connor
7bf2fb8fce
Convert OutputCodec from int to varchar OutputCodecName. ffmpeg has different values for codec_id for different versions of ffmpeg. So just use the codec name instead.
2025-08-20 15:59:02 -04:00
IgorA100
66322e03f1
Chore: Extra semicolon (Monitor.php)
2025-08-04 20:52:51 +03:00
IgorA100
bfda588214
Transferring HTML code from video-stream.js (Monitor.php)
2025-08-03 01:03:33 +03:00
Isaac Connor
8be098cb89
Remove player stuff from streamMode as it doesn't belong.
2025-07-22 13:03:38 -04:00
Isaac Connor
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
Isaac Connor
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
Isaac Connor
68fa95d468
Move getStreamModeMonitors to monitor->getSTreamMode. Add Volume/Mute. Change behaviour of Play/Pause to only show one of them at a time.
2025-06-26 15:05:03 -04:00
Isaac Connor
fee01f9c9b
Add Go2RTC support to monitor
2025-06-26 14:57:06 -04:00
Isaac Connor
e73cb52359
Add type=float for AnalysisFPSLimit
2025-04-29 16:02:44 -04:00
IgorA100
43ea5000c6
Remove extra space (Monitor.php)
2025-03-26 12:14:06 +03:00
IgorA100
640047b9dd
Removed empty line (Monitor.php)
2025-03-26 12:11:23 +03:00
IgorA100
2194c87018
Let's do it as it was before. We'll move the control to JS (Monitor.php)
2025-03-26 12:09:51 +03:00
IgorA100
1932d53f0a
Removed extra space and comma (Monitor.php)
2025-03-26 00:48:04 +03:00
IgorA100
9f0822af3d
Fix: Stream Quality option should only show if a secondary stream is available (Monitor.php)
2025-03-26 00:41:27 +03:00
Isaac Connor
5cff2f0904
FIx name collision on RTSP2WebStream => RTSP2WebStreamOptions
2025-03-02 14:37:26 -05:00
IgorA100
8c586c47ce
Added support for selecting Secondary stream for RTSP2Web (Monitor.php)
2025-02-22 19:49:55 +03:00
Isaac Connor
8c0c08694b
Remove commas that cause problems on some php. Remove unreachable code.
2025-01-24 12:31:35 -05:00
Isaac Connor
5c01109f03
List monitor id in warning message about not being assigned a server.
2024-11-04 09:17:20 -05:00
Isaac Connor
1c0e03b813
Set the default for AnalysisFPSLimit to null so that we can empty it. Add an initial_default to use when creating a new monitor
2024-10-26 13:59:45 -04:00
Isaac Connor
eb117732a8
Rough in shm info and functions for triggering
2024-10-01 12:18:05 -04:00
Isaac Connor
328ce9fc0c
Make no Status record found a debug instead of warning
2024-09-17 11:17:50 -04:00
Isaac Connor
b64461d518
Merge branch 'master' into only_stream_visible
2024-09-03 14:51:36 -04:00
Isaac Connor
b66e04024f
Test for Path being empty to avoid warnings about passing null being deprecated
2024-09-03 09:39:03 -04:00
Isaac Connor
802a0854b5
Add getAnalysingStrings and getRecordingStrings and fix getStatusStrings, removing Tape
2024-08-18 12:18:44 -04:00
Isaac Connor
a3c73b414f
Add WallCLockTimestamps to Monitor model
2024-07-06 08:51:37 -04:00
IgorA100
14604520bc
Merge branch 'ZoneMinder:master' into patch-135
2024-06-05 17:07:51 +03:00
IgorA100
53d057d7aa
After the monitor name, display its ID (Monitor.php)
2024-06-05 15:21:09 +03:00
IgorA100
ba5cb4adcd
Added $this->streamSrc = $streamSrc (Monitor.php)
...
Required to switch without reloading the page between monitors on the Watch page
2024-06-04 15:22:59 +03:00
IgorA100
eb1a38c74c
Changed attr "title" for "#monitor" (Monitor.php)
...
Made in two lines and added capital letters.
2024-06-02 00:07:37 +03:00
Isaac Connor
7543e513fa
Replace useless title on image stream with a useful one describing zoom controls.
2024-05-28 10:10:30 -04:00
Isaac Connor
ae5b73bf90
Resolve conflicts
2024-05-23 14:30:44 -04:00
Isaac Connor
b3c90c3216
Merge branch 'master' into only_stream_visible
2024-05-23 14:18:47 -04:00
Isaac Connor
02ccb5f12b
Remove unused zms url parameters
2024-05-23 13:31:30 -04:00
IgorA100
41a92e11ad
Fix: block "Ratio Control" is created only for Montage page (Monitor.php)
...
Otherwise there will be an error in the browser console that the "changeRatio" function was not found
2024-05-21 19:34:06 +03:00
