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
Peter Keresztes Schmidt
76e126f363
CI/Cirrus: Separate make install into own step
...
This way we keep the output shown in the compile section shorter and more readable.
Remove also the filtering by grep since FreeBSD does not use bash as default shell breaking PIPESTATUS.
2021-04-17 12:50:56 +02:00
root
23f1b68e8a
Merge branch 'continuous' into cont_mast
2021-04-16 11:28:10 -04:00
root
f3ea08c4a1
Merge branch 'continuous' into cont_mast
2021-04-16 11:27:48 -04:00
Isaac Connor
3d1b0e2724
Apply onmouseup/down to other ptz buttons
2021-04-16 11:27:08 -04:00
Isaac Connor
c880618d5f
If no button is associated with the event, assume it is a mouseup
2021-04-16 10:24:48 -04:00
Isaac Connor
c9f83de5f4
Merge branch 'release-1.34' into continuous
2021-04-16 10:16:36 -04:00
Isaac Connor
e0c0598e13
Add on-mouseup and on-mousedown processing
2021-04-16 10:15:57 -04:00
Isaac Connor
d7fa28142f
Use on-mousedown and on-mouseup if doing continuous
2021-04-16 10:15:07 -04:00
root
200dda11a2
Merge branch 'continuous' into cont_mast
2021-04-16 10:07:10 -04:00
Isaac Connor
c9c4224dd2
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d
Store last command for continuous moves so that moveStop can send the correct stop command
2021-04-14 17:19:01 -04:00
Isaac Connor
113e495a7d
Fix margin in ptz buttons
2021-04-14 14:00:24 -04:00