64cfb39043
do an initial fps report early on
2018-04-06 23:21:22 +02:00
d8171750cd
only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd
2018-04-06 23:02:15 +02:00
668c515b21
remove unused code that doesn't compile
2018-04-06 19:48:00 +02:00
b9da309904
remove spaces
2018-04-05 11:33:09 -04:00
ec5f955d26
more db locking
2018-04-05 11:30:14 -04:00
fc38fdcc56
remove extra spaces
2018-04-05 11:30:01 -04:00
a493fd4dd7
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-04-03 17:41:49 -04:00
9fde052d39
merge
2018-04-03 14:41:32 -07:00
a1def1dfe9
whitespace
2018-04-03 12:23:54 -07:00
5a08fcc1db
whitespace, handle file not found
2018-04-03 12:23:38 -07:00
dfc35721f9
ensure that sections are always > section_length
2018-04-03 07:03:12 -07:00
ceb12cdd81
undo a debug thing that shouldn't have been committed
2018-04-03 09:12:18 -04:00
a5b77a59d3
allow 0 pre_event_count
2018-03-29 12:35:03 -04:00
82c44da9be
remove some space
2018-03-29 12:24:21 -04:00
0053404553
remove some spaces
2018-03-29 12:24:12 -04:00
a56eafe796
when deleting Logger object, need to reset zmInitialized because we clear all the codes
2018-03-29 12:24:00 -04:00
b22911f554
wait to closeEvent on monitor shutdown
2018-03-28 14:03:56 -04:00
4be64152e8
put mutex around inserting event stats
2018-03-28 09:12:38 -04:00
b8a792cfb7
whitespace google code style
2018-03-27 11:04:40 -04:00
3a5ff289d0
perfect the whitespace
2018-03-27 10:04:32 -04:00
bcc7011871
update sql loading code in Reload, which will automatically do the db locking
2018-03-27 10:04:19 -04:00
161a0c81f3
pull
...
add mutex around log to db
2018-03-23 14:34:50 -04:00
2107e5b223
whitespace
2018-03-23 12:50:53 -04:00
11cf3ce482
whitespace
2018-03-22 11:33:24 -04:00
43bdaff0a3
Merge ../ZoneMinder.master into storageareas
2018-03-22 11:32:22 -04:00
36ca1d417d
code document
2018-03-22 10:26:05 -04:00
ccf0336c9d
whitespace
2018-03-22 10:25:56 -04:00
b220b8f588
mostly white space fixes, but also, unlock on error condition
2018-03-22 10:25:47 -04:00
06f10e0ed3
fix double free of mysql_result
2018-03-22 10:04:41 -04:00
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
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
d1837a96b4
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-03-09 07:25:28 -05:00
56b2787907
reorder variables to match init order in constructor
2018-03-09 07:24:53 -05:00
dcf7c4fdde
rework loading Monitor using consistent db query
2018-03-09 07:23:40 -05:00
d777f6104f
add a method to access the underlying MYSQL_ROW
2018-03-09 07:23:14 -05:00
a1213142df
whitespace
2018-03-09 07:22:59 -05:00
b4c13d56d6
Merge ../ZoneMinder.master into storageareas
2018-03-06 12:29:59 -05:00
128c4c73e9
Add official sql for loading a Monitor
2018-03-03 13:29:39 -08:00
3fc7ebee6c
Merge ../ZoneMinder.master into storageareas
2018-03-03 09:32:23 -08:00
47ec0abf11
spacing
2018-03-02 18:27:03 -08:00
91c9714e43
cleanup
2018-03-02 18:26:21 -08:00
d980def64f
spacing, increase debug
2018-03-02 18:26:07 -08:00
77ded1f5be
spacing and increase debug
2018-03-02 18:25:46 -08:00
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
a6827c97ab
Cleanup, add some sanity checks
2018-03-02 18:24:39 -08:00
Isaac
Isaac Connor
Isaac Connor
Isaac Connor
Pliable Pixels