Isaac Connor
|
64ab6dff95
|
fix missing )
|
2021-04-10 18:16:59 -04:00 |
|
Isaac Connor
|
cf721ae875
|
Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34
|
2021-04-10 18:16:17 -04:00 |
Peter Keresztes Schmidt
|
f8fc768486
|
FifoSource: Adapt to changed xop::AVFrame API
|
2021-04-11 00:08:26 +02:00 |
|
Isaac Connor
|
23de612faf
|
update RtspServer
|
2021-04-10 15:44:44 -04:00 |
|
Isaac Connor
|
4ead6886a3
|
Make shm debug level 3
|
2021-04-10 15:40:37 -04:00 |
|
Isaac Connor
|
da630f7534
|
Move shm Memory debug statements to level 2.
|
2021-04-10 15:35:24 -04:00 |
|
Isaac Connor
|
60970673c7
|
Implement debug levels in perl side. DEBUG==DEBUG1.
|
2021-04-10 15:35:04 -04:00 |
|
Isaac Connor
|
3f05cfadb0
|
update to Rtsp update
|
2021-04-10 12:21:26 -04:00 |
|
Isaac Connor
|
6319ea887c
|
Need to install generate update script
|
2021-04-09 21:55:07 -04:00 |
|
Isaac Connor
|
1ccc416224
|
Merge branch 'release-1.34'
|
2021-04-09 20:00:47 -04:00 |
|
Isaac Connor
|
35b3d236e0
|
Fix typo in triggers
|
2021-04-09 19:47:08 -04:00 |
|
Isaac Connor
|
1ccb8d7aef
|
Include Event Summaries when loading Monitors
|
2021-04-09 19:46:57 -04:00 |
|
Isaac Connor
|
3dcb71933e
|
Add event summary fields to Monitor Object
|
2021-04-09 19:46:25 -04:00 |
|
Isaac Connor
|
6f28c16915
|
Uwse the db queue for event updates
|
2021-04-09 19:45:55 -04:00 |
|
Isaac Connor
|
08d9ca453a
|
Bump version to 1.35.24
|
2021-04-09 19:45:23 -04:00 |
|
Isaac Connor
|
2b1e0df6be
|
FIx auth= not getting updated
|
2021-04-09 18:46:41 -04:00 |
|
Isaac Connor
|
492a352bed
|
Use updated auth_hash when sending alarm requests
|
2021-04-09 18:33:32 -04:00 |
|
Isaac Connor
|
d9dc61265d
|
Fix DisableAlarms. Use signal when capture fails instead of erroneously using TRIGGER_OFF. Add status to DumpSettings so that we can query it with zmu.
|
2021-04-09 17:46:11 -04:00 |
|
Isaac Connor
|
4e5ef01156
|
Fixup event summary column population, update triggers
|
2021-04-09 16:46:36 -04:00 |
|
Isaac Connor
|
3bdd3c0d12
|
Move event summaries to their own table to reduce contention on Monitor_Status
|
2021-04-09 10:16:35 -04:00 |
|
Isaac Connor
|
c5ca123042
|
Move event summaries to their own table to reduce contention on Monitor_Status
|
2021-04-09 10:16:16 -04:00 |
|
Isaac Connor
|
2e22cd5c3b
|
Mark snapshot events as Archived
|
2021-04-08 15:20:44 -04:00 |
|
Isaac Connor
|
4bd490d121
|
Set signal=true if capture succeeds.
|
2021-04-08 11:37:27 -04:00 |
Andrew Bauer
|
23bd9d7dc1
|
update RTSPServer commit hash for packpack
|
2021-04-08 09:05:01 -05:00 |
|
Isaac Connor
|
2d7479cb59
|
reintroduce Start() methods to analysis and decoding thread
|
2021-04-07 20:36:38 -04:00 |
|
Isaac Connor
|
30dfadcbf1
|
Add some parenthesis and use logic and/or install of binary
|
2021-04-07 14:15:55 -04:00 |
|
Isaac Connor
|
a63186444b
|
Replace char arrays with std::strings in monitor class.
|
2021-04-07 14:15:55 -04:00 |
|
Andrew Bauer
|
5684413eaa
|
packpack - download and unpack rtspserver tarball correctly
|
2021-04-07 13:10:53 -05:00 |
|
Andrew Bauer
|
663c7f51f5
|
don't set -Wconditionally-supported on older gcc
|
2021-04-07 10:01:46 -05:00 |
|
Andrew Bauer
|
3be21d0457
|
add rpm support for RtspServer submodule
|
2021-04-07 09:23:36 -05:00 |
|
Isaac Connor
|
99c28d1f9f
|
Change log level to debug when warning about ZM_OPT_AUTH being turned off. Fixes #3207
|
2021-04-07 09:47:48 -04:00 |
|
Isaac Connor
|
cb7e365e35
|
Add locking increment_it. I think we need it.
|
2021-04-06 13:55:09 -04:00 |
Isaac Connor
|
ffd6928292
|
Merge pull request #3208 from Carbenium/analysis-thread-cleanup
Analysis and decoder thread to auto ptr
|
2021-04-06 09:38:35 -04:00 |
|
Peter Keresztes Schmidt
|
817da4e621
|
Monitor: Make decoder a unique_ptr
The DecoderThread object is owned by the Monitor. Signal this by using unique_ptr.
|
2021-04-06 12:50:05 +02:00 |
|
Peter Keresztes Schmidt
|
fee5ecd72f
|
Monitor: Make analysis_thread a unique_ptr
The AnalysisThread object is owned by the Monitor. Signal this by using unique_ptr.
|
2021-04-06 12:50:05 +02:00 |
|
Isaac Connor
|
4c988860d5
|
Close events in a background thread. Add a ton more debugging
|
2021-04-05 12:56:13 -04:00 |
|
Isaac Connor
|
a5f0945306
|
Merge pull request #3205 from Carbenium/utils-cleanup
Cleanup zm_utils and add unit tests
|
2021-04-03 20:02:15 -04:00 |
|
Peter Keresztes Schmidt
|
e92125afd9
|
utils: remove unused curl include
|
2021-04-04 01:18:34 +02:00 |
|
Peter Keresztes Schmidt
|
b5f3682d4e
|
utils: some more reshuffling/grouping and formatting
|
2021-04-04 01:18:34 +02:00 |
|
Peter Keresztes Schmidt
|
545f0dbb96
|
utils: cleanup Base64Encode
|
2021-04-04 00:39:40 +02:00 |
|
Peter Keresztes Schmidt
|
e330f8553d
|
utils: cleanup Split and Join
|
2021-04-04 00:30:18 +02:00 |
|
Peter Keresztes Schmidt
|
39a896f5b6
|
utils: cleanup StartsWith
|
2021-04-03 23:51:12 +02:00 |
|
Peter Keresztes Schmidt
|
3dbf13e00b
|
utils: cleanup ReplaceAll
|
2021-04-03 23:50:35 +02:00 |
|
Peter Keresztes Schmidt
|
664cd649f8
|
utils: cleanup Trim (was trimSet) and TrimSpaces
|
2021-04-03 23:30:59 +02:00 |
|
Peter Keresztes Schmidt
|
3968a411a0
|
tests/utils: Add tests for QueryString
|
2021-04-03 22:37:44 +02:00 |
|
Peter Keresztes Schmidt
|
fa7c420442
|
tests/utils: Add tests for UriDecode
|
2021-04-03 22:37:44 +02:00 |
|
Peter Keresztes Schmidt
|
46a4b615c8
|
tests/utils: Add tests for base64Encode
Test vectors according to RFC4648
|
2021-04-03 22:37:44 +02:00 |
|
Peter Keresztes Schmidt
|
bbc4afcf1b
|
tests/utils: Add tests for join
|
2021-04-03 22:37:44 +02:00 |
|
Peter Keresztes Schmidt
|
e54c10fdb4
|
tests/utils: Add tests for StringVector split(const std::string&, const std::string&, int limit=0)
|
2021-04-03 22:37:44 +02:00 |
|
Peter Keresztes Schmidt
|
64cf69ebc1
|
tests/utils: Add tests for int split(const char*, const char, std::vector<std::string>&)
|
2021-04-03 22:37:44 +02:00 |