Commit Graph

19060 Commits

Author SHA1 Message Date
Isaac Connor 19cb66b70d fix use of %d when %u is wanted 2021-04-20 11:06:54 -04:00
Isaac Connor e8b761d2bf cppcheck cleanups 2021-04-20 11:04:27 -04:00
Isaac Connor c833833a5e quiet cppcheck by adding overrides 2021-04-20 11:01:02 -04:00
Isaac Connor e5d4665a42 Quiet cpp-check complaints 2021-04-20 11:00:13 -04:00
Isaac Connor b6fcadf31b Put dbrow and fetch into a scope so that it goes away quick 2021-04-20 10:55:39 -04:00
Isaac Connor 0343642c42 duplicate test for neagtive timestamp 2021-04-20 10:54:24 -04:00
Isaac Connor 88a5afc1d2 Fix cpp-check reporting unused variable 2021-04-20 10:45:33 -04:00
Isaac Connor 51c4211ca6 Remove unused variable 2021-04-20 10:43:27 -04:00
Isaac Connor ece981c018 Fix bool return value when int is desired 2021-04-20 10:41:41 -04:00
Isaac Connor 79cede7cac Merge branch 'release-1.34' 2021-04-20 09:24:49 -04:00
Isaac Connor ff2017d8b0 Initialize video_sources and audio_sources to prevent crash 2021-04-20 09:22:37 -04:00
Isaac Connor ed39ffeeb6 Bump version to 1.34.26 2021-04-19 18:39:02 -04:00
Isaac Connor ed58447c4d Only update event StorageId when the new StorageId has a value 2021-04-19 17:53:08 -04:00
Isaac Connor 7485735e9c Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-04-19 17:31:22 -04:00
Isaac Connor c0eb790e45 Fix colour shift in Crop function due to not multiplying x position by colours 2021-04-19 17:29:31 -04:00
Peter Keresztes Schmidt 5f791bce3e CI: Print CMake version before build 2021-04-19 23:16:36 +02:00
Isaac Connor 70313ce152 Revert "Add on-mouseup and on-mousedown processing"
This reverts commit e0c0598e13.
2021-04-19 17:15:35 -04:00
Isaac Connor ffb2d937e1 Revert "Use on-mousedown and on-mouseup if doing continuous"
This reverts commit d7fa28142f.
2021-04-19 17:15:20 -04:00
Isaac Connor aaa1309377 Use > instead of >= to fix duplicated log entries display 2021-04-19 17:14:51 -04:00
Isaac Connor 03b8a98bae xenial has cmake 3.5.1. VERSION_LESS_EQUAL was introduced in 3.7. So lets use VERSION_LESS,11 instead 2021-04-19 17:06:54 -04:00
Isaac Connor 80835614d5 Define timeout 2021-04-19 15:49:06 -04:00
Isaac Connor 1a5d87b3b8 Add GetCurrentLocation 2021-04-19 15:45:55 -04:00
Isaac Connor 506e5f84c9 Remove getCurrentLocation label that says Longitude 2021-04-19 15:45:18 -04:00
Isaac Connor e0fc265263 spacing 2021-04-19 13:19:23 -04:00
Isaac Connor f5e249a6f2 ifout an unused constructor in zone. Add polygon copy in copy constructor. 2021-04-19 13:19:17 -04:00
Isaac Connor f3fb5885a0 Improve debugging 2021-04-19 13:18:35 -04:00
Isaac Connor 3fc9f5ac32 Prevent multiple threads being created by zmc restart by converting sources into a vector 2021-04-19 12:38:35 -04:00
Isaac Connor 6225b8babe Indicate that there should be a space after single char options and their value 2021-04-19 11:56:59 -04:00
Isaac Connor 484ff7dbaa Fail postinst if zmupdate fails 2021-04-19 11:51:35 -04:00
Isaac Connor c1035b7ffd spacing, remove dead code 2021-04-19 10:26:08 -04:00
Isaac Connor 63d7c9a577 Don't tidy in extract as we assume the space will be used soon. 2021-04-19 10:26:08 -04:00
Isaac Connor a9afdbddf1 Remove AddZones function and remove other commented out code 2021-04-19 10:26:08 -04:00
Isaac Connor a38463f99e spacing 2021-04-19 10:26:08 -04:00
Peter Keresztes Schmidt fd79f3d760 CI/Xenial: Call apt-get update before installing packages
Fixes "E: Unable to fetch some archives, maybe run apt-get update or try with --fix-missing?" errors
2021-04-19 00:58:43 +02:00
Isaac Connor 8d883ee7bf This breaks 2021-04-18 13:58:26 -04:00
Isaac Connor df26c25ac9 Add continuous mouseup/down functionailty for Zoom,White,Iris,Focus 2021-04-17 16:32:06 -04:00
Isaac Connor 07b3a7aa57 fix memleak caused by not deleting the packetlock when we can't get the lock 2021-04-17 12:50:26 -04:00
Isaac Connor 5b9745b652 fix memleak due to not delete audio_fifo and video_fifo 2021-04-17 12:50:26 -04:00
Isaac Connor d598edc7df Implement duplicate RTSPSTreamName check 2021-04-17 12:50:26 -04:00
Isaac Connor 03767236d9 Clean up constructor/Setup functions. Add copy constructor. Change Load to return a std::list<Zone> 2021-04-17 12:50:26 -04:00
Isaac Connor 5ab9a48599 Don't grab lock in increment_it if we are deleting cuz we will hang 2021-04-17 12:50:26 -04:00
Isaac Connor 96deedfd53 add explicit to LockedPacket constructor 2021-04-17 12:50:26 -04:00
Isaac Connor 5ace2ca082 Fix loading Importance in sql. Change zones to a std::list<Zone> 2021-04-17 12:50:26 -04:00
Isaac Connor 7970bfd3d8 Implement a 10 second timeout in ffmpeg_camera. read_frame can block forever otherwise 2021-04-17 12:50:26 -04:00
Isaac Connor df36623792 Put a \0 at the beginning of the buffer to help when printing out the contents 2021-04-17 12:50:26 -04:00
Isaac Connor a0d08b8277 More debug in read_into 2021-04-17 12:50:26 -04:00
Isaac Connor 1d034b16dd Must join the previous thread before starting a new one or we crash 2021-04-17 12:50:26 -04:00
Isaac Connor c479c6d68f Must disconnect on error/reload to avoid memleak. Remove waiting 5 second on failure/reload. 2021-04-17 12:50:26 -04:00
Isaac Connor 968bdc5abe Correct nal count reporting 2021-04-17 12:50:26 -04:00
Isaac Connor a067f35491 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2021-04-17 11:55:59 -04:00