Commit Graph

18687 Commits

Author SHA1 Message Date
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
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
Isaac Connor b2f96728d5 Spacing and improve debugging 2021-04-20 23:06:04 -04:00
Isaac Connor c48b42c2df alarm frames without an image are still alarm frames. Count them in alarm count 2021-04-20 23:05:52 -04:00
Isaac Connor fd72fbd2ac Remove unused state var and unneeded if have_output 2021-04-20 17:22:35 -04:00
Isaac Connor c7f06dda0b Improve copy constructor to use initializers 2021-04-20 17:18:57 -04:00
Isaac Connor a3379c986b Only have fifo if HAVE_LIBSWRESAMPLE 2021-04-20 17:18:45 -04:00
Isaac Connor 1657d30be6 add override 2021-04-20 17:18:23 -04:00
Isaac Connor 9ea10584b7 pass fifo by const ref 2021-04-20 17:18:09 -04:00
Isaac Connor 9a54956163 pass fifo by const ref 2021-04-20 17:18:00 -04:00
Isaac Connor 012827e800 bump RtspServer 2021-04-20 17:17:42 -04:00
Isaac Connor c83b9190cb pass peer_ip by const ref 2021-04-20 17:16:09 -04:00
Isaac Connor 05e7b6dfc5 add explicit 2021-04-20 17:15:53 -04:00
Isaac Connor 1f48dbbf6c Use %u instead of %d for monitor id 2021-04-20 17:15:39 -04:00
Isaac Connor 6dc05ec942 add overrides 2021-04-20 17:09:51 -04:00
Isaac Connor f23baf22de Remove unused edges and slices 2021-04-20 17:09:42 -04:00
Isaac Connor b6af846664 add missing initializers 2021-04-20 17:09:14 -04:00
Isaac Connor beb2c4ddf7 fix redundant if 2021-04-20 17:09:00 -04:00
Isaac Connor b37aa35085 improve scope of a,b 2021-04-20 17:07:07 -04:00
Isaac Connor ccf1599b3a use better variable names and avoid reusing user 2021-04-20 17:06:29 -04:00
Isaac Connor de661752ce pass jwt_token_str by reference 2021-04-20 17:04:45 -04:00