Commit Graph

176 Commits

Author SHA1 Message Date
Isaac Connor 89cd7ceaf8 Whitespace, extra parentheses, google code style 2018-09-23 16:47:06 -04:00
Isaac Connor c8b10b2e3b factor out some common code when creating the event directory and add a mkdir for creating the monitor directory. Should make event writing more robust when monitor dirs do not exist for some reason. 2018-09-19 19:50:26 -04:00
Isaac Connor cc417cf3e7 reverse order of tests to be more efficient 2018-09-11 13:19:33 -04:00
Isaac Connor a0e67da51d Improve loging around writing out analysis frames 2018-08-02 15:40:33 -04:00
Isaac Connor e831c1563d pretty the code structure 2018-05-24 10:59:26 -04:00
Isaac Connor dc5ccd04ef Update thumbnail with high scoring image. 2018-05-22 11:31:03 -04:00
Isaac Connor 375af59657 use unsigned for formatting 2018-05-04 09:58:22 -04:00
Isaac Connor 6d5e46e91f whitspace 2018-05-03 13:54:05 -04:00
Isaac Connor d8b461806a fix StartTime in the future log 2018-05-02 11:37:54 -04:00
Isaac Connor 2845f891bc Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-30 10:12:41 -04:00
Isaac Connor e55846e716 Log start_time when its > Now 2018-04-30 10:12:34 -04:00
Isaac Connor a4da624f4c break out of loops when zm-terminate is set 2018-04-27 13:20:38 -07:00
Andrew Bauer 35dcedb2ad
fix ftbs on el7
adds compiler support for PRIu64
2018-04-21 20:55:21 -05:00
Isaac Connor e56cf0b31c switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:57:19 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor 2af539e916 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-12 11:39:30 -04:00
Isaac Connor 3b7992a39b converity scan fixes, and close the .mp4 after updating the db record. 2018-04-12 10:22:46 -04:00
Isaac Connor db0dac6eb2 Don't use static sql when multiple threads might be using it 2018-04-10 13:06:36 -07:00
Isaac Connor 9fde052d39 merge 2018-04-03 14:41:32 -07:00
Isaac Connor 2107e5b223 whitespace 2018-03-23 12:50:53 -04: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 1bc6e40fbc add mutex locking around mysql functions so that we can go multi-threaded 2018-03-01 19:20:52 -08:00
Isaac Connor c9bc5a8cd8 if given timestamp is in the future, reset it, it is likely invalid 2018-01-31 14:33:20 -05:00
Isaac Connor 218e34a079 Can only have 6 digitals, not 8 2018-01-30 11:23:09 -05:00
Isaac Connor 5a3d0b944e Detect invalid delta_time and don't exit on failed mysql 2018-01-26 12:21:12 -05:00
Isaac Connor 9284e26512 get rid of the snapshot setting. If we aren't storing all frames, then we should always store the snapshot. 2018-01-13 15:15:14 -05:00
Isaac Connor 2922a86d23 fixes to new Storage Schemes code 2017-12-19 11:01:03 -05:00
Isaac Connor 8a8001f14a fix missingc_str() 2017-12-18 13:25:24 -05:00
Isaac Connor 705a98276f change StorageScheme to Scheme 2017-12-18 13:17:43 -05:00
Isaac Connor d312482a2b add StorageScheme to Storage and Events. Deprecate ZM_USE_DEEP_STORAGE 2017-12-18 12:52:26 -05:00
Isaac Connor 2df96bf6ee use the return value of stat 2017-12-12 12:51:54 -05:00
Isaac Connor 0eb2ae60f3 only try to write timecodes if the open was successful 2017-11-22 12:13:28 -08:00
Isaac Connor 3c55daaf36 Merge branch 'tesla' of github.com:connortechnology/ZoneMinder into tesla 2017-11-22 12:10:54 -08:00
Isaac Connor a1fe0c4de3 store the value of saveJpegs in the event 2017-11-21 23:56:22 -05:00
Isaac Connor 159c0a7165 moer cppcheck fixes 2017-11-17 07:52:26 -05:00
Isaac Connor 2d3aa08303 include <0 in test on event frame timestamp 2017-10-23 09:56:30 -04:00
Isaac Connor 666233af54 fix mving capture_file_format to staticCOnfig 2017-10-18 20:46:26 -04:00
Isaac Connor ad97023732 spacing 2017-10-12 08:54:43 -07:00
Isaac Connor 8ea335d45e whitespace 2017-10-10 15:08:24 -04:00
Isaac Connor 7b2163f824 add debug 2017-10-10 12:58:06 -04:00
Isaac Connor 219b7e0f36 output failing sql 2017-10-08 09:13:56 -04:00
Isaac Connor 869d2b4f16 make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks 2017-09-25 16:22:41 -04:00
Isaac Connor c241b6dddd Merge branch 'split_zmeventstream' into storageareas 2017-06-22 10:46:32 -04:00
Isaac Connor 226514e887 split EventStream into it's own files 2017-06-22 10:10:28 -04:00
Isaac Connor 76f63686cb Merge branch 'fix_event_viewing' into storageareas 2017-06-22 09:24:31 -04:00
Isaac Connor 5e75588bfb Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause 2017-06-21 17:14:02 -04:00
Isaac Connor f0d80ddfd4 fix runstate merge 2017-06-13 21:18:09 -04:00
Isaac Connor 7a67a5e475 fix merge 2017-06-13 21:15:58 -04:00
Isaac Connor 085d239a6e Merge branch 'master' into storageareas 2017-06-13 18:02:28 -04:00
Andrew Bauer bf04a68085 Merge pull request #1752 from connortechnology/filter_by_runstate
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00