ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,271 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

2336 Commits

Author SHA1 Message Date
Isaac Connor 469a7347e8 include zm_terminate to make Capture break out of process is TERM'd 2018-04-30 15:09:00 -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
Isaac Connor 8a80cf686b Merge branch 'master' into storageareas 2018-04-26 21:58:34 -04:00
Isaac Connor 356badf21d Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-04-26 11:57:46 -04:00
Isaac Connor 8bdc68dc65 include zm_signal.h so that we have access to zm_terminate. Use zm_terminate to break out of endless loops. Add incoming bytes counts 2018-04-25 10:49:35 -04:00
Isaac Connor 117555a857 Merge branch 'storageareas' of github.com:/connortechnology/ZoneMinder into storageareas 2018-04-25 09:39:10 -04:00
Isaac Connor 61fe2a734b Add SIGHUP handler so that zmc reloads instead of dies 2018-04-25 09:38:18 -04:00
Isaac Connor f04bccceb2 handle out of order pts better 2018-04-25 04:59:08 -04:00
Isaac Connor 184596ed4b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-25 04:29:35 -04:00
Isaac Connor 20f6985dff implement capturing bandwidth 2018-04-24 14:11:27 -04:00
Andy Bauer 678503b992 fix ftbs on el7 2018-04-24 12:16:19 -05:00
Isaac Connor bbb10fa4b4 Turn off ffmpeg debugging output, as it seems to conflict with the code at zm_db.cpp 34 2018-04-24 12:40:15 -04:00
Isaac Connor 21413c0fe6 comment out corrupting code 2018-04-24 11:49:10 -04:00
Isaac Connor cc525b2397 Output more detailed shared mem size info 2018-04-24 11:41:54 -04:00
Isaac Connor 4d95498664 Prevent double init of Ffmpeg by using FFMPEGInit() 2018-04-24 11:41:31 -04:00
Isaac Connor cc77561826 fix last_event being uint64 2018-04-24 11:40:38 -04:00
Isaac Connor b5ff820c61 Test that shm is always valid in zma so that zma dies if zmc does. 2018-04-23 16:24:44 -04:00
Isaac Connor 5f7d404a0c spacing & style. Put locking around db accesses in RealoadLinkedMonitors 2018-04-23 16:24:15 -04:00
Isaac Connor e8eaf5fc80 quiten build error 2018-04-23 14:43:16 -04:00
Isaac Connor c0d04521d4 cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files. 2018-04-23 14:36:54 -04:00
Isaac Connor 18b015903a cleanup. Google Code Style. Move diag_path from a static to a class member so that multiple zones will create different diag files. 2018-04-23 14:36:46 -04:00
Isaac Connor 3ab0755e03 google code style plus other cleanups 2018-04-23 13:50:10 -04:00
Isaac Connor a110ae71f5 put lines back preventing double open of mysql 2018-04-23 13:48:14 -04:00
Isaac Connor 235fc640be exit_zmu must come before use 2018-04-23 11:15:33 -04:00
Isaac Connor 11cacebb3b use a function called exit_zmu instead of exit() to properly close logs and db. The reason is just to reduce connection lost logs in mysql. 2018-04-23 11:14:44 -04:00
Isaac Connor 3b9f7b38c5 Use int instead of long. Monitor->GetCaptureDelay returns an int, so no reason to use long. 2018-04-23 10:40:42 -04:00
Isaac Connor 609244857d google styleguide updates 2018-04-23 10:39:32 -04:00
Isaac Connor 9c0600cace Add a HUP Handler 2018-04-23 10:29:42 -04:00
Andrew Bauer 35dcedb2ad
fix ftbs on el7 
adds compiler support for PRIu64
 2018-04-21 20:55:21 -05:00
Isaac Connor 56186a42ef change signal_check_points to a per-monitor variable instead of parts of config. Only call SignalCheck if signal_check_points is > 0 2018-04-19 10:10:14 -04:00
Isaac Connor eb21a5113e Add a debug line in SignaCheck function 2018-04-19 09:34:14 -04:00
Isaac Connor bd69f6a2ca close the videoStore when closing FFmpegCamera 2018-04-18 15:30:42 -04: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 fd1c69d48a switch to uint64_t for event_id because long long can actually be 128 bit 2018-04-17 13:51:20 -04:00
Isaac Connor 3b0282f6ec Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-17 12:32:10 -04:00
Isaac Connor 0198ac832d improve logging around loss of signal and lock around static sql 2018-04-17 12:30:58 -04:00
Isaac Connor 34111251d9 Introduce Close() to camera and monitor api. Use it to close a camera when there is an error with capturing. Remove the sleep10 on error. 2018-04-17 07:02:52 -07:00
Isaac Connor 0b0fbae1c5 Add output of paused image when paused 2018-04-12 18:43:57 -04:00
Isaac Connor f9f78e9aa3 Convert event_id to a 64bit unsigned int 2018-04-12 13:40:11 -07:00
Isaac Connor b974b4dcd1 google code style, and when paused, don't die after 10 seconds 2018-04-12 13:14:00 -04:00
Isaac Connor 2af539e916 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-12 11:39:30 -04:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor c766c1ddd1 spacing cleanup 2018-04-12 10:28:22 -04:00
Isaac Connor 71d5984eb0 delete stream after use 2018-04-12 10:26:18 -04:00
Isaac Connor ea8a132289 use swscale's new init function 2018-04-12 10:25:06 -04:00
Isaac Connor 65c69d419b google code style and remove throws from constructors and destructors 2018-04-12 10:24:47 -04:00
Isaac Connor c6635b8096 make swscale more robust by moving bits that can fail into an init function instead of the constructor 2018-04-12 10:24:10 -04:00
Isaac Connor 3130a21a28 google code style 2018-04-12 10:23:20 -04:00