2217 Commits

Author	SHA1	Message	Date
Isaac Connor	e634e0addc	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas	2018-02-17 12:25:42 -05:00
Isaac Connor	77426a7838	term to terminal for clarity	2018-02-17 12:25:05 -05:00
Isaac Connor	e6d9292dd0	term to terminal for clarity	2018-02-17 12:25:00 -05:00
Isaac Connor	9caa71233a	catch another EOF case	2018-02-17 11:07:06 -05:00
Isaac Connor	8ba02d8e0e	Fix re-opening log file. If there was no change in File Log level, then it wouldn't close and reopen, but the filename might have changed, so we have to.	2018-02-14 13:50:16 -05:00
Isaac Connor	2e11c12d73	add debugging to logging	2018-02-14 11:56:54 -05:00
Isaac Connor	9a19a9cddd	Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas	2018-02-13 10:11:49 -05:00
Isaac Connor	744d776d9f	return when ReopenFfmpeg fails	2018-02-13 10:11:39 -05:00
Isaac Connor	162a08e81d	return when ReopenFfmpeg fails	2018-02-13 10:11:05 -05:00
Isaac Connor	e83586dbe1	Rename Term to Terminal to differentiate between Terminate	2018-02-13 06:23:18 -05:00
Isaac Connor	ef72e585b9	Include id in the user object	2018-02-13 05:28:00 -05:00
Isaac Connor	4f57a40cb6	Update Monitor_Status after connection lost and when exiting	2018-02-12 13:24:19 -05:00
Isaac Connor	cd606dbab8	whitespace	2018-02-07 08:03:01 -05:00
Isaac Connor	a4c956da7d	Only update db entry when value changes	2018-02-05 22:59:22 -05:00
Isaac Connor	af67e3b686	whitespace	2018-02-04 11:54:25 -08: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	868e17a414	Allow Method in Monitors to be NULL	2018-02-02 10:31:55 -05:00
Isaac Connor	6942aaed15	whitespace	2018-01-31 14:36:01 -05:00
Isaac Connor	882a242b76	Fix mpeg streaming.	2018-01-31 14:35:00 -05:00
Isaac Connor	31ad807a90	If ffmpeg is open in PrimeCapture, close it. Turn all Fatals into Errors	2018-01-31 14:34:39 -05:00
Isaac Connor	bdb5176981	increase debug lvel of dumpPacket	2018-01-31 14:33:42 -05:00
Isaac Connor	c9bc5a8cd8	if given timestamp is in the future, reset it, it is likely invalid	2018-01-31 14:33:20 -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	218e34a079	Can only have 6 digitals, not 8	2018-01-30 11:23:09 -05:00
Isaac Connor	8c90a8a47a	Fix Id => MonitorId in MonitorStatus	2018-01-29 23:06:59 -05:00
Isaac Connor	1d221dff7c	Frame throttling is not an error.	2018-01-29 11:45:33 -05:00
Isaac Connor	fc4edefd81	Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into tesla	2018-01-29 07:35:24 -08:00
Isaac Connor	7e2f132cdd	Better debugging	2018-01-29 07:22:05 -08:00
Isaac Connor	cfb0461fcf	Rename column Id to MonitorId in MonitorStatus	2018-01-29 09:31:43 -05:00
Isaac Connor	f98217e62a	remove useless debug code	2018-01-28 15:17:48 -05:00
Isaac Connor	190d8d1600	remove useless debug code	2018-01-28 15:17:41 -05:00
Isaac Connor	748f78d7a6	clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error	2018-01-28 15:17:22 -05:00
Isaac Connor	057509637a	TUrn a warning into a debug	2018-01-28 15:16:06 -05:00
Isaac Connor	16c24240f7	clean out old threaded code that has been #defined out for a long time. When EOF, after re-opening, continue instead of logging the error	2018-01-28 15:14:38 -05:00
Isaac Connor	5a3d0b944e	Detect invalid delta_time and don't exit on failed mysql	2018-01-26 12:21:12 -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	66fd02a29e	Use dumpPacket	2018-01-23 18:15:29 +01:00
Isaac	abb2cfbe12	fix zm_av_packet_ref for old ffmpeg. Need to set the size and flags as well as copying the mem.	2018-01-23 18:14:55 +01:00
Isaac Connor	6bc83ca6a2	Set Default Scheme	2018-01-23 09:07:40 -05:00
Isaac	bfa0a00e67	dfebug improvements	2018-01-22 03:27:44 +01:00
Isaac	41a05f5eef	simplify logic, improve debugging	2018-01-22 03:26:36 +01:00
Isaac	414930cb90	simplify logic, improve debugging	2018-01-22 03:26:33 +01:00
Isaac	4127aa50f3	simplify logic, improve debugging	2018-01-22 03:26:25 +01:00
Isaac Connor	18f0610d87	Merge zm_ffmpeg.cpp from zma_to_thread	2018-01-21 17:18:29 -05:00
Isaac Connor	59a1272307	bump version	2018-01-18 11:39:33 -05:00
Isaac Connor	360a10276f	Fix. We were deleting the keyframe that we wanted to keep.	2018-01-17 10:01:48 -05:00
Isaac Connor	687d797303	Only log debug message about excluding audio if there is an audio stream	2018-01-17 09:53:03 -05:00
Isaac Connor	7f4deef4a9	Move debug comment about opening audio codec into the part where the audio codec is opened	2018-01-17 09:21:17 -05:00
Isaac Connor	26cea49f1a	handle nulls in event_prefix and label_format in Monitor::Reload	2018-01-16 11:08:35 -05:00