b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
704ccaee73
2059 alarm cause ( #2060 )
...
* added alarm_cause as a test
* initial attempt to integrate with notes
* testing sizeof
* add zone labels
* fixed typo
* fixed typo
* comments and formatting
* Downgraded invalid attribute to error
* Removed Error downgrade. Instead do a undefined check on field params
* Added help text
2018-03-12 19:38:12 -04:00
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
91c9714e43
cleanup
2018-03-02 18:26:21 -08:00
28342b907b
add a thread for deleting the event. This is because writing out the final frames of an mp4 can take a long time, during which we are not analyzing.
2018-03-01 19:22:22 -08:00
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -08:00
cd606dbab8
whitespace
2018-02-07 08:03:01 -05:00
a4c956da7d
Only update db entry when value changes
2018-02-05 22:59:22 -05:00
e25af4b40c
cleanup, reset result
2018-02-02 16:07:13 -05:00
868e17a414
Allow Method in Monitors to be NULL
2018-02-02 10:31:55 -05:00
cfb0461fcf
Rename column Id to MonitorId in MonitorStatus
2018-01-29 09:31:43 -05:00
057509637a
TUrn a warning into a debug
2018-01-28 15:16:06 -05:00
50fc4a2d94
Use a memory table called Monitor_Status to store FPS and Status info for Monitors. This is to reduce locking and updates on the main Monitors table.
2018-01-24 11:51:11 -05:00
59a1272307
bump version
2018-01-18 11:39:33 -05:00
26cea49f1a
handle nulls in event_prefix and label_format in Monitor::Reload
2018-01-16 11:08:35 -05:00
2c121fb784
If we get a term signal while waiting for zmc, die.
2018-01-12 07:12:54 -08:00
a304af727b
debug GetFPS
2017-12-12 14:37:02 -05:00
70d43d2d27
fix strncpy calls
2017-12-12 13:42:48 -05:00
34668db43b
use return value of WriteJpeg
2017-12-12 13:39:36 -05:00
fe74c41723
fix integer division instead of double
2017-12-12 12:56:19 -05:00
db915b2c56
Don't do an unneccesary assignemnt
2017-12-12 12:52:30 -05:00
f8738f2387
quiet coverity
2017-12-12 12:37:49 -05:00
344539f5dc
cleanup
2017-11-28 11:55:47 -05:00
d73f9e8a73
wip, crashes
2017-11-28 11:11:41 -05:00
1e50df741f
fix some memleaks
2017-11-28 09:50:09 -05:00
4b92a788f7
fix filter execute
2017-11-24 15:37:50 -05:00
ebe3073c59
only update fps if we have an image capture
2017-11-21 23:57:01 -05:00
a9419064ef
don't calc fps if no time has passed
2017-11-07 09:35:13 -05:00
ee96f58ac4
fix fps reporting value when Capture doesn't return a new frame
2017-11-05 09:59:06 -05:00
cab8c4cd5e
cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style
2017-11-03 13:49:42 -04:00
cfaf10335b
add Monitor status, capturrFPS and AnalysisFPS to processes
2017-10-24 16:08:31 -07:00
fece06c9e3
google code style
2017-10-19 17:12:36 -04:00
965e1e8bc1
improve readability of debug statement
2017-10-18 10:22:53 -07:00
df1fa97e0c
handle nulls in StorageId and device
2017-10-06 16:17:37 -04:00
354262c557
wip nvsocket
2017-10-03 13:28:56 -07:00
5c13ae26e3
Merge branch 'storageareas' into work_on_zms
2017-08-23 10:43:19 -04:00
676c4b7ddc
Merge branch 'master' into storageareas
2017-08-22 09:52:14 -04:00
ac5d1738ea
allow changing of the timestamp char code delimeter ( #1972 )
2017-08-21 11:27:11 -04:00
014951bf78
fix connect
2017-08-11 13:00:18 -04:00
83f8a240d5
blah
2017-08-11 12:20:46 -04:00
daee5b4450
experiment with no ffmpeg thread
2017-08-11 12:03:37 -04:00
49319990fa
Don't keep setting the event_file unnecessarily. Add some code comments
2017-07-26 10:38:18 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels
Isaac Connor
APHW2 MFGENG
Andrew Bauer
Isaac Connor