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

104 Commits

Author SHA1 Message Date
Isaac Connor 78b97303a3 Merge branch 'storageareas' of github.com:/ConnorTechnology/ZoneMinder into storageareas 2019-02-13 11:32:40 -05:00
Isaac Connor 2563951c1f comment out the signal blocking. I still can't figure out why we would want it 2019-02-13 11:32:34 -05:00
Isaac Connor 1aad1f765d slep for 1 second if there is an error in capturing 2019-02-13 11:28:18 -05:00
Isaac Connor fe1e17d097 Capture can reasonably return -1 for EOF. 2018-09-05 11:16:17 -04:00
Isaac Connor 8792190f75 use 0 for return code when exiting cleanly 2018-05-25 14:21:41 -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 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
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 06fed41d5a whitespace 2018-04-06 23:21:47 +02:00
Isaac Connor b9da309904 remove spaces 2018-04-05 11:33:09 -04:00
Isaac Connor 4f57a40cb6 Update Monitor_Status after connection lost and when exiting 2018-02-12 13:24:19 -05:00
Isaac Connor 310193791d add a 10 second sleep before reconneting 2018-02-04 11:54:11 -08:00
Isaac Connor e25af4b40c cleanup, reset result 2018-02-02 16:07:13 -05:00
Isaac Connor ba2c111762 restructure to keep trying to open the camera instead of exiting. 2018-01-31 14:32:48 -05:00
Isaac Connor 8c90a8a47a Fix Id => MonitorId in MonitorStatus 2018-01-29 23:06:59 -05:00
Isaac Connor 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
Isaac Connor 7d2becee21 add reload on HUP 2018-01-10 12:59:42 -05:00
Isaac Connor ecd86b3fde cleanup 2017-11-12 15:18:39 -05:00
Isaac Connor cfaf10335b add Monitor status, capturrFPS and AnalysisFPS to processes 2017-10-24 16:08:31 -07:00
Isaac Connor 7d2453e7ac fix google code style 2017-09-04 15:28:23 -04:00
Isaac Connor 273229858f Merge branch 'master' into storageareas 2017-04-16 11:26:18 -04:00
Isaac Connor 30455feef7 code style 2017-03-31 11:12:52 -04:00
Isaac Connor a33a8402ef Merge branch 'armv7_neon' of https://github.com/mastertheknife/ZoneMinder into neon 
Conflicts:
	src/zmf.cpp
	src/zms.cpp
 2017-03-24 12:14:16 -04:00
Kfir Itzhak e02e033cc8 Renamed ssedetect() to hwcaps_detect() and added ARM Neon and AVX2 detection 2017-03-19 02:05:01 +02:00
SteveGilvarry e5b18ee213 Remove zmc -r argument as it does not seem to be implemented. 2017-03-18 23:25:14 +11:00
Isaac Connor 5ae34a7561 Merge branch 'master' into storageareas 2017-01-02 09:39:10 -05:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 11b160b7d1 document code blocks 2016-11-03 16:44:03 -04:00
Isaac Connor 2b37999cd5 Merge branch 'fix_zm_image_memleak' into storageareas 2016-10-07 11:39:03 -04:00
Isaac Connor 006fcad10a move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:35:14 -04:00
Isaac Connor 37a4c67ae6 move jpeg context freeing to a Deinitialise function instead of ~Image. Turn down the logging 2016-10-07 11:33:25 -04:00
Isaac Connor 81c0b28786 fix call to setStartTime 2016-09-15 11:43:08 -04:00
Isaac Connor 8f33ed6ca6 introduce another sharedmem variable called startup_time, which is set by zmc indicating when the process started. 2016-09-15 11:16:05 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Andrew Bauer 4deb0d53c8 Add pod documentation to C binaries 2015-06-20 17:11:20 -05:00
Isaac Connor a534e66437 Add version to the startup log line 2015-06-08 10:24:40 -04:00
Emmanuel Papin 7811354d92 Move iostream inclusion in zm.h and declare explicitely the namespace for cout 2015-05-29 23:22:20 +02:00
Isaac Connor 21915eb92c Merge branch 'master' into freebsd_fixes 2015-03-31 11:06:53 -04:00
Isaac Connor 2e10263b64 Improve logging to include monitor name and for shared cameras show 1/1 instead of 0/1 2015-03-04 16:34:31 -05:00
Isaac Connor c7dc157f4d FreeBSD fix 2015-02-24 09:22:55 -05:00
Isaac Connor 6f42f1c6d8 add version command line argument to zmc 2015-01-06 20:49:33 -05:00
Isaac Connor 56b1a50b2b revert 2015-01-03 14:07:18 -05:00
Isaac Connor af570259d1 got these swapped, should be the other way around 2015-01-03 13:59:23 -05:00
Isaac Connor e460c6f448 BSD uses some different includes, these are from FreeBSD ports 2015-01-01 17:18:12 -05:00
Isaac Connor 48f4d7eb93 Merge branch 'master' into BSD_device 2014-12-08 16:53:39 -05:00
Emmanuel Papin 73b25a1de0 Merge branch 'master' of https://github.com/ZoneMinder/ZoneMinder into memory_fix_mismatches 2014-11-29 03:39:05 +01:00
manupap1 b2d3daaa65 Fix a mismatch free in zmc binary 2014-11-15 13:10:19 +01:00
manupap1 b4732e4750 Close logger and database on exit 2014-11-14 22:17:44 +01:00