Isaac Connor
a1def1dfe9
whitespace
2018-04-03 12:23:54 -07:00
Isaac Connor
5a08fcc1db
whitespace, handle file not found
2018-04-03 12:23:38 -07:00
Isaac Connor
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
Isaac Connor
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
Isaac Connor
82c44da9be
remove some space
2018-03-29 12:24:21 -04:00
Isaac Connor
0053404553
remove some spaces
2018-03-29 12:24:12 -04:00
Isaac Connor
a56eafe796
when deleting Logger object, need to reset zmInitialized because we clear all the codes
2018-03-29 12:24:00 -04:00
Isaac Connor
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
Isaac Connor
4be64152e8
put mutex around inserting event stats
2018-03-28 09:12:38 -04:00
Isaac Connor
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
Isaac Connor
3a5ff289d0
perfect the whitespace
2018-03-27 10:04:32 -04:00
Isaac Connor
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
Isaac Connor
161a0c81f3
pull
...
add mutex around log to db
2018-03-23 14:34:50 -04:00
Isaac Connor
2107e5b223
whitespace
2018-03-23 12:50:53 -04:00
Isaac Connor
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
Isaac Connor
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
Isaac Connor
36ca1d417d
code document
2018-03-22 10:26:05 -04:00
Isaac Connor
ccf0336c9d
whitespace
2018-03-22 10:25:56 -04:00
Isaac Connor
b220b8f588
mostly white space fixes, but also, unlock on error condition
2018-03-22 10:25:47 -04:00
Isaac Connor
06f10e0ed3
fix double free of mysql_result
2018-03-22 10:04:41 -04:00
Isaac Connor
50696319cc
Always error out when stream fails, even on EOF. Just don't log EOF as an error.
2018-03-22 09:25:35 -04:00
Isaac Connor
ea38f7cca4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-15 11:43:15 -04:00
Isaac Connor
27736fb5d9
Merge ../ZoneMinder.master into storageareas
2018-03-15 11:04:41 -04:00
Isaac Connor
6f3d16fe10
label_format can be null
2018-03-13 12:06:03 -07:00
Isaac Connor
cefd00d1ea
load User and Pass as well
2018-03-13 14:50:41 -04:00
Pliable Pixels
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
Isaac Connor
7fb1c8921b
reorder functions to put them in a better order
2018-03-09 07:50:47 -05:00
Isaac Connor
d1837a96b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-09 07:25:28 -05:00
Isaac Connor
56b2787907
reorder variables to match init order in constructor
2018-03-09 07:24:53 -05:00
Isaac Connor
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
Isaac Connor
d777f6104f
add a method to access the underlying MYSQL_ROW
2018-03-09 07:23:14 -05:00
Isaac Connor
a1213142df
whitespace
2018-03-09 07:22:59 -05:00
Isaac Connor
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
Isaac Connor
128c4c73e9
Add official sql for loading a Monitor
2018-03-03 13:29:39 -08:00
Isaac Connor
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
Isaac Connor
47ec0abf11
spacing
2018-03-02 18:27:03 -08:00
Isaac Connor
91c9714e43
cleanup
2018-03-02 18:26:21 -08:00
Isaac Connor
d980def64f
spacing, increase debug
2018-03-02 18:26:07 -08:00
Isaac Connor
77ded1f5be
spacing and increase debug
2018-03-02 18:25:46 -08:00
Isaac Connor
ede13ac41b
put all db access after finishing encoding, because we don
...
't care when they happen, and we need the encoding done.
2018-03-02 18:25:20 -08:00
Isaac Connor
a6827c97ab
Cleanup, add some sanity checks
2018-03-02 18:24:39 -08:00
Isaac Connor
9af6dc02bc
better debug of packet pts/dts/duration
2018-03-01 19:22:47 -08:00
Isaac Connor
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
Isaac Connor
4d81b7b66b
Do not just reconnect to the input stream on EOF. pts/dts gets outof whack when doing passthrough. Instead treat it as a loss of signal, which will end the event and start a new one
2018-03-01 19:21:41 -08:00
Isaac Connor
1bc6e40fbc
add mutex locking around mysql functions so that we can go multi-threaded
2018-03-01 19:20:52 -08:00
Isaac Connor
b3d23ab233
merge zma_to_thread version of db functions, which include a mutex lock
2018-03-01 19:20:29 -08:00
Isaac Connor
3586825c90
fix preevent_count==0 causing div/0
2018-02-26 17:08:05 -08:00
Isaac Connor
902f5f098a
remove debug code
2018-02-26 16:10:27 -08:00
Isaac Connor
5b55bef721
Add support for h264_mmal
2018-02-22 18:33:11 -05:00
Isaac Connor
e634e0addc
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-02-17 12:25:42 -05:00