Isaac Connor
7901950c48
spacing
2021-04-26 09:40:08 -04:00
Isaac Connor
4385076e66
Fix encrypting password when saving User
2021-04-26 09:40:08 -04:00
Isaac Connor
02a1ecee6f
Remove dbeug
2021-04-26 09:40:08 -04:00
Isaac Connor
7bbcb7e36a
Merge pull request #3223 from Carbenium/font
...
Modernize the ZmFont API and add tests
2021-04-25 19:57:32 -04:00
Isaac Connor
1204a23789
Merge pull request #3222 from Carbenium/monitor-destr-crash
...
Monitor: Fix a crash when destroying a monitor (shutdown)
2021-04-25 18:58:52 -04:00
Peter Keresztes Schmidt
3020acf994
ZmFont: Store character padding in font file
...
The size/variant specific character padding should be stored with the font data.
Modify the FontBitmapHeader accordingly and introduce a version field in the FontFileHeader
so we are able to check we have a font file with the right structure associated with that version.
The version field is set to 1 in this changeset.
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
a918e8aeba
Image: Modernize Annotate method
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
07e49e47af
utils: Add a clamping function mimicking std::clamp
...
This can be replaced with std::clamp in C++17.
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
4d14347c42
tests: Add tests for ZmFont
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
0c939f45dd
ZmFont: Rework/modernize API
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
9f56f633f1
dep: Add span-lite as C++20 span implementation
...
Link to the project https://github.com/martinmoene/span-lite
2021-04-25 23:13:21 +02:00
Peter Keresztes Schmidt
6d06eac55e
Monitor: Fix a crash when destroying a monitor (shutdown)
...
We have to make sure close_event_thread is joined before we destroy the thread object,
otherwise std::terminate will be called.
2021-04-25 23:09:32 +02:00
Peter Keresztes Schmidt
4180bc99ac
Zone: Sprinkle some const-ness
...
Keep references in for-loops const if no modifications are preformed on the object.
2021-04-25 22:34:33 +02:00
Peter Keresztes Schmidt
d4458d1216
Monitor: Store zones as vector instead of list
...
std::vector suits the usage pattern better with no random inserts/deletions
2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt
bb35d0a8bb
Frame: Auto-format
2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt
eb51408ef9
ZMPacket+Frame: Use vector to store ZoneStats
...
We don't any of the usage patterns that would warrant a std::list (random insert/deletion). Switch to vector which has much lower overhead for this kind of usage.
2021-04-25 22:29:18 +02:00
Peter Keresztes Schmidt
ad32a94931
ZoneStats: Rename members according to Google style guide
2021-04-25 17:18:07 +02:00
Peter Keresztes Schmidt
9e4674b53a
ZoneStats: Let the compiler define the copy constr. and assignment op.
...
There is no need for the user-defined versions since no manual resource management is done in the class.
Also a user-defined copy constructor or assignment operator prevents the implicit definition of a move constructor.
2021-04-25 17:18:07 +02:00
Isaac Connor
df754f0085
Can't do suspend in sendCmd
2021-04-24 19:22:17 -04:00
Isaac Connor
8d4c2afda8
Can't do suspend in sendCmd
2021-04-24 12:00:38 -04:00
Peter Keresztes Schmidt
1dbfa0790a
web: fix eslint errors
2021-04-24 01:42:13 +02:00
Isaac Connor
d1687df6af
Bump version to 1.35.27 for ModetDuringPTZ changes
2021-04-23 14:52:29 -04:00
Isaac Connor
4843cb8593
Add ModectDuringPTZ and suspend and resume functions
2021-04-23 14:52:29 -04:00
Isaac Connor
e256d9a5a8
Use ZoneMinder::Monitor->find_one instead of zmDbGetMonitor so that we get an object with useful methods
2021-04-23 14:52:29 -04:00
Isaac Connor
36ac473ad2
Add suspend/resume of MotionDetection of ModectDuringPTZ is off.
2021-04-23 14:52:29 -04:00
Isaac Connor
95a715a96a
When resume is given, clear the ref image, so that analysis can re-assign it. Don't do ref image in decode, leave it for analysis only. Handle zm_terminate after waiting for decode.
2021-04-23 14:52:29 -04:00
Isaac Connor
affac43964
Move DumpImgBuffer into public section so that we can clear an image instead of deleting it
2021-04-23 14:52:29 -04:00
Isaac Connor
9254c99ab8
Add ModectDuringPTZ
2021-04-23 14:52:29 -04:00
Isaac Connor
c539969faa
Cleanup
2021-04-23 14:52:29 -04:00
Isaac Connor
8a59d60854
add ModectDuringPTZ to Monitors
2021-04-23 14:52:29 -04:00
Isaac Connor
f4837d72ee
add text for ModectDuringPTZ
2021-04-23 14:52:29 -04:00
Isaac Connor
f59904ea7e
Add ModectDuringPTS checkbox on Control tab
2021-04-23 14:52:29 -04:00
Andrew Bauer
f3349fb625
update packpack to use latest rtspserver commit
2021-04-23 11:54:36 -05:00
Andrew Bauer
6d90fd7bd6
update specfile to use latest rtspserver commit
2021-04-23 11:53:38 -05:00
Isaac Connor
4d9fb5b225
Don't show live thumbnail if we do not have Stream permission. Do not show groups if not view permission. Do not make them links to montage if no stream permission
2021-04-23 09:51:38 -04:00
Isaac Connor
76080cb857
add a stop function to dbQueue to clear out the queue before we kill log.
2021-04-23 09:25:07 -04:00
Isaac Connor
3e88f60f6d
Fix end code block comment on DetectMotion
2021-04-23 09:19:13 -04:00
Isaac Connor
b9fb08745c
Cleanup, fix length test for stats insert
2021-04-23 09:18:56 -04:00
Isaac Connor
9e890a7539
Add libcurl.so.4 as an option to load before libcurl-gnutls
2021-04-23 09:10:54 -04:00
Isaac Connor
37e0f010e3
Require session to be instantiated
2021-04-23 09:08:48 -04:00
Isaac Connor
15a769bcd1
add hashing of passwords on user save
2021-04-23 09:07:50 -04:00
Isaac Connor
e01533af7f
Add users to routes
2021-04-23 08:52:55 -04:00
Isaac Connor
27d200d376
Switch to using std::string for inserting frames and stats. We just can't know how long the sql will be and we aren't going to waste 2MB of ram on it. Remove unused functions.
2021-04-22 22:30:45 -04:00
Isaac Connor
d07d85dd6c
Clean User add to match behaviour of Monitors. For some reason posting to index doesn't call add unlike Monitors. Clean out duplicated Views
2021-04-22 12:25:13 -04:00
Isaac Connor
8671e65517
More work on flushing out ZoneStats. Use references to avoid copying
2021-04-21 21:40:39 -04:00
Isaac Connor
be9c5d3f95
Introduce a ZoneStats structure/class and implement a list of them in packet, frame. Store the stats in a list in the packet until it is time to write them to the db in the event. Hence implement batched queuing of stats.
2021-04-21 17:51:43 -04:00
Isaac Connor
8ca93d2f0b
store event stats regardless of savejpegs or image availability
2021-04-21 14:59:57 -04:00
Isaac Connor
7c70c26fbd
Cleanup old Continuous stop. Rename lastMove to LastCmd and implement for Zoom
2021-04-21 14:30:02 -04:00
Isaac Connor
354a3d9f09
Add on-mouseup and on-mousedown processing
2021-04-21 12:20:06 -04:00
Isaac Connor
408e0963a0
Improve code and logging
2021-04-20 23:06:17 -04:00