394 Commits

Author	SHA1	Message	Date
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
Isaac Connor	943a4cef73	Merge branch 'storageareas' into rotate_video	2016-05-13 15:00:50 -04:00
Isaac Connor	71e9553648	add rotation to video	2016-05-13 14:51:26 -04:00
Isaac Connor	18461b0c64	Add some debugging	2016-05-06 12:39:10 -04:00
Isaac Connor	88a0bdc026	Add some code comments. Make mocord always honour section_length	2016-05-05 14:51:26 -04:00
Steve Gilvarry	da157f5a1a	Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage	2016-04-30 22:27:10 +10:00
Isaac Connor	5eebc50bfb	tabs to spaces	2016-04-29 08:57:31 -04:00
Isaac Connor	097e7f3906	Merge branch 'master' into storageareas	2016-04-28 16:40:44 -04:00
Isaac Connor	30b3fa8a8b	add a cast to help the compile figure out which function to use	2016-04-28 12:57:38 -04:00
Isaac Connor	fac07cba6d	Merge branch 'master' into tabs_to_spaces	2016-04-28 09:31:40 -04:00
Isaac Connor	629f141734	Merge pull request #1441 from SteveGilvarry/remove_commented_code ... Delete large commented out code segment	2016-04-28 09:30:43 -04:00
Isaac Connor	24e3306955	master master	2016-04-28 09:20:56 -04:00
Isaac Connor	2d8c484792	rotate dimensions when instantiating the Monitor object	2016-04-25 16:48:26 -04:00
Isaac Connor	8c53925fdc	redo rotation fix. cameras have to be given the width and height that the camera will be sending. The monitor will report rotated dimensions.	2016-04-25 16:00:34 -04:00
Isaac Connor	851e8f46ff	redo fix_rotate	2016-04-25 15:57:39 -04:00
Isaac Connor	26a45d5fa9	Don't rotate dimensions when constructing the monitor because they are already rotated	2016-04-25 13:55:28 -04:00
Steve Gilvarry	4ca61b7bd8	Removed 180 lines of commented out code that has been hanging around ... in here for a long time.	2016-04-25 22:12:49 +10:00
Isaac Connor	44f32f46b7	deprecate zmdbFetchOne in favor of zmDbRow	2016-04-20 11:56:58 -04:00
Isaac Connor	30066f788d	Merge branch 'feature-h264-videostorage' into storageareas	2016-04-14 12:35:21 -04:00
Isaac Connor	c189e60d9b	add some comments, and dump filename and AVFormatContext on failure to write header	2016-04-14 12:34:52 -04:00
Isaac Connor	dc7f2ff353	fix merge problems	2016-04-06 11:44:57 -04:00
Isaac Connor	765f79a87f	Merge branch 'icon_video' into storageareas	2016-04-06 11:16:38 -04:00
Isaac Connor	4bc200f839	fix merge	2016-04-06 08:38:10 -04:00
Isaac Connor	9a795432cf	merge all the commits from the messed up iconnor_video branch	2016-04-05 17:14:46 -04:00
Isaac Connor	60642c1fff	Merge branch 'iconnor_video' into storageareas	2016-04-05 12:32:33 -04:00
Isaac Connor	03b1ced568	tabs to spaces and use 2space indenting	2016-04-04 10:11:48 -04:00
Isaac Connor	82b32578ec	Merge branch 'master' into iconnor_video	2016-04-01 12:54:09 -04:00
Isaac Connor	abcf48b65c	Merge branch 'master' into feature-h264-videostorage	2016-04-01 08:53:45 -04:00