Commit Graph

17112 Commits

Author SHA1 Message Date
Isaac Connor c9bd09ae7b report both capture_fps and analysis_fps 2020-12-09 15:03:18 -05:00
Isaac Connor 9d43b64d4a Add debug and rtsp_server 2020-12-09 15:03:00 -05:00
Isaac Connor 03903d2dad spacing 2020-12-09 15:01:35 -05:00
Isaac Connor f54b8fff44 use mutex and condition_variable to manage signalling. Lots of debugging and fixes 2020-12-09 15:01:24 -05:00
Isaac Connor 02dd1d4cc5 Use recursive_mutex for mutex because we need to hold the lock twice 2020-12-09 15:00:57 -05:00
Isaac Connor 50e1e4391a Include capture_fps and analysis_fps in status 2020-12-09 15:00:29 -05:00
Isaac Connor 6bf5d1b5a1 Fixes to analysis_fps vs analysis_fps_limit. Fixes to logic in analysis. Make capture_fps and analysis_fps be part of shared mem. 2020-12-09 15:00:11 -05:00
Isaac Connor 282c020d86 spacing code style 2020-12-09 12:21:41 -05:00
Isaac Connor 697f9a50fe Terminate thread also when zm_terminate is true 2020-12-09 12:21:31 -05:00
Isaac Connor a3ff81b279 Add zm_rtsp_server_thread.cpp to CMakeLists.txt 2020-12-09 12:20:01 -05:00
Isaac Connor 054e1b583d Rough in code for the RTSP Server thread 2020-12-09 12:19:35 -05:00
Isaac Connor 47b3f319e7 Add capture_fps and analysis_fps to shared memory. This also requires support for type double 2020-12-09 12:18:43 -05:00
Isaac Connor d571b2dd98 Add live555 detection and HAVE_RTSP_SERVER config 2020-12-08 15:59:06 -05:00
Isaac Connor b261fbb397 Merge branch 'master' into zma_to_thread 2020-12-07 16:26:26 -05:00
Isaac Connor aaf4b37439 spacing, don't need to set packet.size=0 2020-12-07 15:53:09 -05:00
Andrew Bauer 691f9a70f9 eslint 2020-12-07 14:44:45 -06:00
Andrew Bauer 1772d37c08 convert updatePresetLabels() to jquery 2020-12-07 12:32:07 -06:00
Andrew Bauer 389ad22dcd watch.js - target not $target 2020-12-07 10:36:14 -06:00
Andrew Bauer 6e17b04a7e WIP continue jquery conversion of watch.js 2020-12-07 10:22:54 -06:00
Isaac Connor 36b5702c50 Increase LinkedMonitor debugging. Fix LinkedMonitors. Fixes #3091 2020-12-05 19:36:44 -05:00
Isaac Connor 7a827c1fd6 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-05 16:57:32 -05:00
Isaac Connor 4d33667a85 Merge branch 'release-1.34' 2020-12-05 16:51:42 -05:00
Isaac Connor ea6478b8a0 Escape column names for mysql 8. Fixes #3092 2020-12-05 16:38:53 -05:00
Isaac Connor fdbca4760f dbFetchAll should always return an array. Not null on error 2020-12-05 16:38:25 -05:00
Isaac Connor df35bd75a5 Escape column names for mysql 8 2020-12-05 16:29:23 -05:00
Andrew Bauer ed043f9d55 bw dropdown - match only on bwselect class 2020-12-05 12:31:30 -06:00
Isaac Connor 0a89b906a0 Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-05 10:41:35 -05:00
Isaac Connor 9b8f63b36f EstimatedRamUse to Estimated Ram Use so we don't an en_gb translation 2020-12-05 10:23:29 -05:00
Andrew Bauer 7106cd43a7 eslint 2020-12-04 18:30:05 -06:00
Andrew Bauer ac069e6e5e fix zoom class in skins.js 2020-12-04 14:47:13 -06:00
Andrew Bauer 0bf39dc954 fix setting the thumbnail class in events 2020-12-04 14:44:05 -06:00
Andrew Bauer 21aeccb5d0 centralize thumb animation js, add delay 2020-12-04 14:35:39 -06:00
Isaac Connor 0d0eac98be Move the form below the navbar because it has a form in it. Remove oninput from minTime and maxTime 2020-12-04 15:28:51 -05:00
Isaac Connor 11f527514e use a common function for datetime changes. 2020-12-04 15:28:26 -05:00
Isaac Connor d998eac6ef Update Filter code and Groups display 2020-12-04 15:17:04 -05:00
Isaac Connor 3a7571dd63 undo bogus cache use in Object constructor 2020-12-04 15:16:43 -05:00
Andrew Bauer 5665eb14f5 fix bw select again 2020-12-03 19:33:10 -06:00
Isaac Connor fc6c8ac33d
Merge pull request #3090 from hax0kartik/master
Fix font rendering issue
2020-12-03 19:03:42 -05:00
hax0kartik 8012438573 Fix font rendering issue 2020-12-04 05:22:54 +05:30
Isaac Connor b2e5df1854 Need to -1 to size parameter when calling SetFontSize 2020-12-03 18:31:41 -05:00
Isaac Connor 1bbcf4ea31 spacing and make assignments a little more readable/efficient maybe 2020-12-03 16:43:27 -05:00
Isaac Connor 330327ded0 Improve code readability. Use a define for header size 2020-12-03 16:21:18 -05:00
Isaac Connor d781d7169a Merge branch 'release-1.34' of github.com:ZoneMinder/zoneminder into release-1.34 2020-12-03 14:29:01 -05:00
Isaac Connor b30b4cd66a Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:48 -05:00
Isaac Connor fc9c87cf9f Merge branch 'master' of github.com:ZoneMinder/zoneminder 2020-12-03 14:28:13 -05:00
Isaac Connor 5a489b3e99 Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081 2020-12-03 14:28:03 -05:00
Isaac Connor 6e64114ac3 Skip row locking in UpdateDiskSpace if the filter is already locking rows 2020-12-03 14:26:51 -05:00
Andrew Bauer e93de2a3a4 partial jquery convesion of watch.js 2020-12-03 13:12:01 -06:00
Isaac Connor cfd4c17953 Include invalid font path in the error message 2020-12-03 13:35:12 -05:00
Isaac Connor 7ef34bce7b Include new fonts dir in install 2020-12-03 13:30:51 -05:00