20837 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Isaac Connor	d0ca677207	Fix %u instead of %d for id which is unsigned. Pass string instead of c_str	2022-07-14 12:07:26 -04:00
Isaac Connor	9db65f5c5f	Remove unneeded = assignments	2022-07-14 12:03:49 -04:00
Isaac Connor	66f5b9b93d	Remove zm_rtsp_server_thread as it isn't used anymore	2022-07-14 12:01:10 -04:00
Isaac Connor	fbe70df1b6	use const and just pass string	2022-07-14 11:57:35 -04:00
Isaac Connor	129e712692	Remove redundant assignment	2022-07-14 11:53:05 -04:00
Isaac Connor	61fcd60a40	initialize all members and make lostInterval an int since we can get negative numbers when doing subtraction	2022-07-14 10:58:42 -04:00
Isaac Connor	fd566b2212	Pass std::strings by ref	2022-07-14 10:53:47 -04:00
Isaac Connor	b29e61b30e	Don't need to check for mAuthenticator, can just delete it	2022-07-14 10:52:14 -04:00
Isaac Connor	eb8646f1de	Pass std::strings by ref	2022-07-14 10:51:49 -04:00
Isaac Connor	90e27e9d3a	Just pass the std::string not c_str()	2022-07-14 10:51:39 -04:00
Isaac Connor	774adcf7cc	Use nullptr instead of 0 when initialising hp	2022-07-14 10:44:00 -04:00
Isaac Connor	64a9120ea7	packet_counts is always true here	2022-07-14 10:42:01 -04:00
Isaac Connor	4f2dc894d5	get rid of got_packet to quiet cppcheck	2022-07-14 10:35:22 -04:00
Isaac Connor	4ab8166665	Init Janus_Healthy although it is never used	2022-07-14 10:29:10 -04:00
Isaac Connor	0cd315c6a4	reduce scope of CurlMsg m	2022-07-14 10:26:55 -04:00
Isaac Connor	43649e1e36	Don't need to test for event	2022-07-14 10:25:19 -04:00
Isaac Connor	b4c832c789	Code style, initialize Amcrest_Alarmed to false in constructor	2022-07-14 10:25:05 -04:00
Isaac Connor	e589171138	mFormatContext is already in Camera	2022-07-14 10:18:53 -04:00
Isaac Connor	f96e5e526d	MOptArgV points into opVect so it needs to stick around.	2022-07-14 10:14:29 -04:00
Isaac Connor	e6de9c3e01	A polygon must have 3 vertices at minimum	2022-07-14 10:06:26 -04:00
Isaac Connor	4805064d61	Remove always false condition	2022-07-14 10:02:58 -04:00
Isaac Connor	173cc8af21	Make AmcrestAPI and JanusManager explicit to satisfy cppcheck	2022-07-14 10:00:23 -04:00
Isaac Connor	ce589db5d0	Initialize mAddressFamily to satisfy cppcheck	2022-07-14 09:59:58 -04:00
Isaac Connor	1bbb2ea3d5	reuse event_file to shut up cppcheck	2022-07-14 09:59:38 -04:00
Isaac Connor	004e4415d3	Pass filename by reference for performance	2022-07-14 09:59:09 -04:00
Isaac Connor	f3a5f13877	Fix null ptr dereference on systems with SENDFILE7. FreeBSD for example	2022-07-14 09:50:19 -04:00
Isaac Connor	bc12205ec3	pass jwt_token_str and key by ref for performance	2022-07-14 09:46:24 -04:00
Isaac Connor	e38dd4649d	Convert missed strftimes to dateTimeFormatter. Fixes #3526	2022-07-13 18:47:27 -04:00
Isaac Connor	df49d7a1ee	Send out a quit command when jumping to prev/next video so that hopefully zms exits.	2022-07-13 18:47:27 -04:00
Isaac Connor	9334001247	Convert frame->pts to stream pts. Add a seek if jumping a long way into the mp4	2022-07-13 18:47:27 -04:00
Isaac Connor	356678f164	Use ints when comparing maxfps and effectivefps so that small decimal differences in fps don't matter.	2022-07-13 18:47:27 -04:00
Isaac Connor	af6ad6acfa	Merge pull request #3524 from ovargasp/master ... created es_la.php with all messages up to 1.37.17	2022-07-13 16:36:40 -04:00
ovargasp	ea0ad373fe	Update zm_monitor.cpp	2022-07-13 12:33:09 -06:00
ovargasp	213d57ee03	Update options.php	2022-07-13 12:05:53 -06:00
ovargasp	ea73c8b81e	Update zm_monitor.cpp	2022-07-13 11:05:28 -06:00
ovargasp	53824fa3da	Update zm_monitor.cpp	2022-07-13 11:01:18 -06:00
ovargasp	4be7cf409a	fix translate label	2022-07-12 18:08:26 -06:00
ovargasp	ebc9920442	Merge branch 'ZoneMinder:master' into master	2022-07-12 18:06:14 -06:00
Isaac Connor	a93e5c8478	Bump version to 1.37.18	2022-07-12 17:34:08 -04:00
Isaac Connor	a617a70620	Add UserId to MontageLayouts	2022-07-12 17:33:34 -04:00
Isaac Connor	fa2a02c27f	Add UserId to js side layouts so we can check it	2022-07-12 17:32:32 -04:00
Isaac Connor	c6cc23d73c	Check for ownership of layout before saving	2022-07-12 17:32:07 -04:00
Isaac Connor	56828f4d48	Add Id=0 for default user	2022-07-12 17:31:41 -04:00
Isaac Connor	2988d49454	When saving a layout, check for System[edit] or ownership of the layout.	2022-07-12 17:31:30 -04:00
Isaac Connor	64ed7370b6	Add UserId field to MontageLayouts	2022-07-12 17:30:54 -04:00
Isaac Connor	b298b46b5e	Add UserId to MontageLayouts	2022-07-12 17:30:25 -04:00
Isaac Connor	802ecc293c	Roughed in Uniview PTZ module. Currently is a copy of Hikvision. Only reboot is correct.	2022-07-12 13:25:47 -04:00
ovargasp	7d3c52cd49	Update es_la.php	2022-07-11 16:39:22 -06:00
Isaac Connor	bbba518215	Merge pull request #3522 from ovargasp/patch-3 ... more translations changes	2022-07-11 18:36:01 -04:00
Isaac Connor	00399b340c	Merge pull request #3523 from ovargasp/patch-4 ... translations on modal states...	2022-07-11 18:34:23 -04:00