2102 Commits

Author	SHA1	Message	Date
Isaac Connor	64816aa005	fixes from cppcheck.	2017-11-18 16:00:10 -05:00
Isaac Connor	1abcb19851	add Copy routing	2017-11-18 09:45:54 -05:00
Isaac Connor	7d77cd75fe	eliminate redundant code and memleak	2017-11-18 09:45:47 -05:00
Isaac Connor	159c0a7165	moer cppcheck fixes	2017-11-17 07:52:26 -05:00
Isaac Connor	22ff831859	more cppcheck recommendations	2017-11-16 21:21:56 -05:00
Isaac Connor	0318fb54a6	add missing initializers	2017-11-16 18:23:02 -05:00
Isaac Connor	1686584908	more cppcheck fixes	2017-11-16 09:19:27 -05:00
Isaac Connor	a956ffe7b3	add Copy and =operators to satisfy cppcheck	2017-11-16 09:15:04 -05:00
Isaac Connor	d5962b11ff	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-14 02:48:38 -05:00
Isaac Connor	65e7fb0014	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-14 02:40:12 -05:00
APHW2 MFGENG	d07f36a7ee	Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas	2017-11-13 10:27:27 -08:00
Isaac Connor	ecd86b3fde	cleanup	2017-11-12 15:18:39 -05:00
Isaac Connor	f476c8f2e5	fixes from cppcheck	2017-11-12 13:25:19 -05:00
Isaac Connor	a99c5b54fa	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-12 13:16:49 -05:00
Isaac Connor	feca6c3df0	add a copy constructor at the advice of cppcheck	2017-11-12 13:16:18 -05:00
Isaac Connor	71f13a7c9a	optimisations/fixes from cppcheck	2017-11-12 10:27:47 -05:00
Isaac Connor	4c76b74645	decrease debugging	2017-11-11 09:11:05 -05:00
Isaac Connor	57a53f6fdd	spacing and fixes	2017-11-09 15:03:23 -05:00
APHW2 MFGENG	402ad0ace3	Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas	2017-11-07 18:22:12 -08:00
APHW2 MFGENG	e17bcb9178	updates for mast ffmpeg	2017-11-07 18:21:51 -08:00
Isaac Connor	a9419064ef	don't calc fps if no time has passed	2017-11-07 09:35:13 -05:00
Isaac Connor	c3cfd096c7	Don't connect to the monitor when doing an eventStream	2017-11-07 09:34:47 -05:00
Isaac Connor	4b8a8e7b56	fix new return value from Capture, 1 signals 1 frame captured	2017-11-05 18:02:09 -05:00
Isaac Connor	0a3327e2d2	move test for h264 into the code that opens the stream instead of comparing on every capture	2017-11-05 09:59:27 -05:00
Isaac Connor	ee96f58ac4	fix fps reporting value when Capture doesn't return a new frame	2017-11-05 09:59:06 -05:00
Isaac Connor	cab8c4cd5e	cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style	2017-11-03 13:49:42 -04:00
Isaac Connor	fdbd344d74	whitespace	2017-11-03 09:23:08 -04:00
Isaac Connor	495cd580aa	add more debugging	2017-11-02 11:45:49 -04:00
Isaac Connor	a8b679e479	set frameCount for audio packets too so that a long period of just audio will return and update lastframesent etc.	2017-11-02 11:45:33 -04:00
Isaac Connor	f0cfebe719	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-11-01 13:11:49 -04:00
Isaac Connor	ac9116e78b	add connkey to logging so I can tell which process is which	2017-11-01 12:01:12 -04:00
Isaac Connor	c9d52b47ba	add debug	2017-10-31 13:29:49 -07:00
Isaac Connor	ab1c9f7c98	add more debugging	2017-10-31 16:27:43 -04:00
Isaac Connor	eb48759ff8	wip	2017-10-27 13:37:51 -07:00
Isaac Connor	0fc6852065	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-10-24 16:25:49 -07:00
Isaac Connor	df14b3c812	handle failure to connect to zmc in zms gracefully	2017-10-24 16:22:26 -07:00
Isaac Connor	fdbbc5101e	Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas	2017-10-24 16:10:20 -07:00
Isaac Connor	b54d340bda	google code style fix	2017-10-24 16:10:16 -07:00
Isaac Connor	cfaf10335b	add Monitor status, capturrFPS and AnalysisFPS to processes	2017-10-24 16:08:31 -07:00
Isaac Connor	2d3aa08303	include <0 in test on event frame timestamp	2017-10-23 09:56:30 -04:00
Isaac Connor	fece06c9e3	google code style	2017-10-19 17:12:36 -04:00
Isaac Connor	666233af54	fix mving capture_file_format to staticCOnfig	2017-10-18 20:46:26 -04:00
Isaac Connor	10accc4226	google code style	2017-10-18 10:23:40 -07:00
Isaac Connor	965e1e8bc1	improve readability of debug statement	2017-10-18 10:22:53 -07:00
Isaac Connor	f81471da09	google code style	2017-10-18 10:22:37 -07:00
Isaac Connor	3436c65aab	minor logic improvement	2017-10-18 10:22:15 -07:00
Isaac Connor	4b30dd540c	tabs to spaces	2017-10-18 10:21:54 -07: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