421 Commits

Author	SHA1	Message	Date
Isaac Connor	7e920eb5d3	add a non-const version of StartTime() which we need in order to assign to video_data->recording	2017-04-12 13:36:39 -04:00
Isaac Connor	eb390c323e	Merge branch 'storageareas' into ffmpeg_321	2017-04-11 11:14:23 -04:00
Isaac Connor	766925d9a7	Split MonitorStream into it's own files.	2017-04-10 21:51:18 -04:00
Isaac Connor	6a9819e16b	whitespace, comments	2017-04-05 16:10:21 -04:00
Isaac Connor	e70c7fa1ef	whitespace and comments	2017-03-31 23:34:58 -04:00
Isaac Connor	9c495b07dd	code style, whitespace, comments	2017-03-31 11:12:42 -04:00
Isaac Connor	f19b3d5505	create zm_packet	2017-02-18 15:22:56 -05:00
Isaac Connor	f73bf0aee0	add a cast to fix compilation with clang	2017-02-02 12:43:13 -05:00
Isaac Connor	61827fec0c	remove redundant mkdir eventdir.	2017-01-18 09:31:08 -05:00
Isaac Connor	dccd1e9732	fix	2017-01-05 13:54:34 -05:00
Isaac Connor	71ad08613e	fix	2017-01-05 11:30:01 -05:00
Isaac Connor	d1ed472db0	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2017-01-05 10:09:11 -05: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	d97c1f1cff	Merge branch 'fix_braces' into storageareas	2016-12-08 14:58:38 -05:00
Isaac Connor	7f2bf04c2f	Merge branch 'cookie_http_only' into storageareas	2016-12-08 14:26:13 -05:00
Isaac Connor	c27a18a758	fix braces in zm_monitor.cpp	2016-12-08 11:49:54 -05:00
Isaac Connor	1a25b957ad	check for and create events dir for monitor on Object instantiation	2016-11-27 20:10:12 -05:00
Andy Bauer	873bb9902b	recalculating zmswap at this point is unnesessary	2016-11-19 08:53:17 -06:00
Andy Bauer	3afa8937d8	calculate string lengths and array ndx's properly	2016-11-19 08:52:22 -06:00
Isaac Connor	2bd080a6a6	Merge branch 'master' into storageareas	2016-11-15 08:41:00 -05:00
Andy Bauer	d3a7fca079	only unlink if zmc is being destroyed	2016-11-14 19:01:00 -06:00
Andy Bauer	6c7d71361a	unlink the mmap file when the monitor object is destroyed	2016-11-13 16:40:54 -06:00
Isaac Connor	420d141bc7	split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable	2016-10-18 09:50:01 -04:00
Isaac Connor	9656a7c3e8	Store Oriention on event creation	2016-10-12 09:12:09 -04:00
Isaac Connor	85dd5ea00c	do the videostore test in the constructor	2016-09-26 20:08:09 -04:00
Isaac Connor	bd22d72e18	cleanups, code style, free resample_context	2016-09-26 11:01:47 -04:00
Isaac Connor	bd076fed69	Merge branch 'storageareas' into packetqueue	2016-09-16 09:56:41 -04:00
Isaac Connor	85b2ba73ab	change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH	2016-09-14 09:31:57 -04:00
Isaac Connor	88d86afd85	Merge ../ZoneMinder.master into storageareas	2016-09-13 10:02:53 -04:00
Isaac Connor	2bc5742aec	Merge branch 'feature-h264-videostorage' into storageareas	2016-09-13 09:53:39 -04:00
Isaac Connor	39e06b929f	add braces and only call closeEvent if there is an event	2016-09-13 09:36:45 -04:00
Steve Gilvarry	fc060135fe	Move our recording flag deeper into closeevent	2016-09-13 22:58:38 +10:00
Isaac Connor	d0fb2acfaa	rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments	2016-09-12 21:35:14 -04:00
Isaac Connor	3a06ba7a65	Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later.	2016-09-09 09:15:04 -04:00
Isaac Connor	824d7c5b43	Merge ../ZoneMinder.Steve into packetqueue	2016-08-31 11:58:22 -04:00
Isaac Connor	55c6e5a6db	cleanup putting packetqueue in the monitor. It should be in the camera	2016-08-31 11:47:42 -04:00
Steve Gilvarry	d1bcb14629	Right direction	2016-09-01 00:00:10 +10:00
Steve Gilvarry	44df4a830d	Merge branch 'feature-h264-videostorage' into monitor_packetqueue	2016-08-11 20:44:48 +10:00
Isaac Connor	6ac1a70b9c	Merge my Rotation/Orientation work and fixes for bad h264 streams	2016-08-10 12:22:04 -04:00
Isaac Connor	14d8496972	add NULL test for RTSPDesribe	2016-07-14 10:27:24 -04:00
Isaac Connor	6644db3bea	check for null on various Monitor fields	2016-06-24 10:29:50 -04:00
Isaac Connor	081c0add72	fix	2016-06-23 11:25:50 -04:00
Isaac Connor	ccea620531	check for null before instantiating strings	2016-06-23 11:13:26 -04:00
Isaac Connor	c6761dd094	fix merge	2016-06-21 14:02:36 -04:00
Isaac Connor	e29a0ebe71	Merge branch 'feature-h264-videostorage' into storageareas	2016-06-21 13:48:32 -04:00
Isaac Connor	6a8db582ff	whitespacing updates	2016-06-21 12:21:18 -04:00
Isaac Connor	fad1d95011	fix NULL in linkedMonitors column	2016-06-09 13:06:57 -04:00
Isaac Connor	d9f2911f0d	handle null values in Monitors columns	2016-06-09 12:51:22 -04:00
Steve Gilvarry	0abfb7378a	Buffer work	2016-05-18 00:01:33 +10:00