f6c2e35fe9
Merge pull request #3164 from jim-perkins/patch-1
...
Update HikVision.pm
2021-02-18 09:09:26 -05:00
9a37c393cc
Update HikVision.pm
...
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]
https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
3e10c3a8a4
Fix return codes
2021-02-17 16:42:48 -05:00
2a49bd124f
Add VNC monitor type
2021-02-17 16:39:16 -05:00
cf6d2caef7
Make setting fmt non fatal.
2021-02-17 16:34:19 -05:00
0dc748acb5
drop back to compat 12 for buster
2021-02-17 14:13:42 -05:00
99568b8046
remove debian vcs
2021-02-17 13:41:52 -05:00
cf9406a1e8
undef max if defined in rfb/rdbclient.h
2021-02-17 13:40:12 -05:00
33b9dae0f2
fix use of uint32_t for buffer indexes
2021-02-17 13:38:52 -05:00
1f2c7d3f98
allow debhelper >13
2021-02-17 13:17:30 -05:00
f0d8a654f8
Remove debug, use fewer lines
2021-02-17 13:11:55 -05:00
c608af4df7
Correct timeline when using Weekday
2021-02-17 13:11:02 -05:00
d2777d2fe4
Remove ffmpeg from recommends. We depend on it
2021-02-17 12:53:30 -05:00
0edbb3d9c4
debug is optional, not extra
2021-02-17 12:52:06 -05:00
0d0be59b6b
Need to require debhelper 13
2021-02-17 12:51:44 -05:00
a3ed986343
Fix filename
2021-02-17 12:40:41 -05:00
4a1efe56ff
remove --parallel which isn't needed anymore
2021-02-17 12:40:27 -05:00
8c85ffd904
Remove apache2.2 auth lines
2021-02-17 12:40:14 -05:00
8a3ea42528
Remove Uploaders. Update mysql packages to be default-
2021-02-17 12:39:56 -05:00
b4c594b15c
Use apache2_invoke instead of enmod
2021-02-17 12:32:06 -05:00
b58ecca040
Allow RTSPServer to be unselected
2021-02-17 12:07:55 -05:00
8e4922665f
Add icons to installed files
2021-02-17 11:56:43 -05:00
217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
6007914344
we don't build libzoneminder-perl at this time, so don't try to instal it's man pages
2021-02-17 11:49:59 -05:00
a60d683f73
Don't build man pages. They will be built by dh
2021-02-17 11:07:33 -05:00
f061c25183
Make failure to set video standard non-fatal.
2021-02-17 11:02:56 -05:00
66efc3ba59
.tmpfile is deprecated. Use .tmpfiles
2021-02-17 10:29:21 -05:00
519e39b4f4
Reloading has to stop other threads while we are re-initing the logs. So move it down
2021-02-17 10:07:36 -05:00
233b666595
maybe fix docs building
2021-02-16 17:19:13 -05:00
e7f3bc357d
More syncup with official debian build
2021-02-16 17:03:17 -05:00
e601c08ed0
last_read_index and last_write_index are not int32_ts. Add last_motion_score which should fix our failure to detect alarms in zmalarm etc
2021-02-16 16:56:10 -05:00
36c7d17111
Remove dh-systemd update standards-version and homepage
2021-02-16 16:32:19 -05:00
b0f9b210a8
Update for debhelper > 12
2021-02-16 16:22:29 -05:00
aa94795b96
When auth is not turned on, show an error instead of login fields.
2021-02-16 16:09:23 -05:00
59cdf971fa
convert last_read_index and last_write_index to int32_t so that we can have -1 as a value in other functions.
2021-02-16 14:43:52 -05:00
317274248b
Allow mid= and dupId= in monitor view to allow mid reuse. Alphabetically sort Monitors in LinkedMonitors by name
2021-02-16 14:16:59 -05:00
f08979aae9
Bump compat to 13
2021-02-16 14:13:42 -05:00
41dc0212e0
Move include of algorithm up to top to hopefully fix issues with min and max being defined elsewhere and so compile fails
2021-02-16 10:39:04 -05:00
a82247b105
Some cleanups in disconnect
2021-02-16 10:39:04 -05:00
a56d78bb04
Don't sleep if Analyse returns false and we are terminating
2021-02-16 10:39:04 -05:00
71183a6002
fix case of vidWidth. Fixes #3162
2021-02-14 16:28:08 -05:00
9c3bf0af1d
Always default to mp4 for now
2021-02-14 09:49:30 -05:00
99264e4072
Fix swscale failing on resolution change. Fixes #3161
2021-02-12 11:55:25 -05:00
5a910c4a4b
use lock_guard instead of unique_lock
2021-02-12 10:45:32 -05:00
2cb6d21faf
get rid of while loop in ::Analyze. Switch login on if Ready() to bail early so we don't indent so much.
2021-02-12 10:38:21 -05:00
4915e940b7
clean out old mutex. Add event_mutex to protect around event creation/deletion
2021-02-12 10:14:35 -05:00
5663b05260
Merge pull request #3159 from Carbenium/camera-raii
...
Let Monitor own its Camera
2021-02-11 15:22:56 -05:00
3d759e1fe0
Monitor: Some reformatting of previously touched lines
2021-02-11 20:02:08 +01:00
c0151caa64
Monitor: Signal by making the camera a unique_ptr the ownership relation
...
In addition we get RAII and thus automatic destruction of the camera when the monitor is destructed.
Monitor API change: getCamera -> LoadCamera
If additional properties of the camera are needed externally they should be exposed directly via Monitor.
2021-02-11 19:22:22 +01:00
35514649c9
Monitor: Make audio and video streams directly accessible
...
Also remove Camera::getId() which returend the monitor ID. Since a camera is owned by an monitor, there is no need for this. Also it causes a circular include.
2021-02-11 19:22:22 +01:00
Isaac Connor
Jim Perkins
Isaac Connor
Peter Keresztes Schmidt