ZaneYork
/
zoneminder
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
11,508 Commits 20 Branches 69 Tags 131 MiB
Commit Graph

11508 Commits

Author SHA1 Message Date
Isaac Connor 945825cdcb Google code style, fix join() in that we weren't using the delimitere parameter 2018-05-12 14:37:41 -07:00
Isaac Connor d9fff848e7 change Groups to a vector, add GroupNames function 2018-05-12 14:37:26 -07:00
Isaac Connor 1ef5226316 cleanup 2018-05-12 14:37:13 -07:00
Isaac Connor b445ddc981 typo fix 2018-05-12 14:36:53 -07:00
Isaac Connor 4bbd8d6ab9 Use zmDbConnect in Database instead of duplicating all the connect code 2018-05-12 14:36:38 -07:00
Isaac Connor 5071fd1ba1 Add mysql_auto_reconnect and force autocommit on 2018-05-12 14:35:43 -07:00
Isaac Connor 1fed8f3428 finish handling a change of Realm. Actually makes it unneccessary to specify the Realm in ControlDevice 2018-05-11 13:14:54 -04:00
Isaac Connor 16e63f81df fully specify ZoneMinder::Database::ZmDbConnect 2018-05-11 12:42:56 -04:00
Isaac Connor 0a5980ce2e Fix prealarmcount > alarm_frames. If Alarm frames is 1 and PreEventCount == 0, then the old line would have evaluated to true. By making it > alarm_count instead of >= alarm_count-1, we get the same behaviour for non-zero preevent counts, and also since alarm_frames >= 1 always, we handle the preeventcount=0 case. 2018-05-11 12:18:24 -04:00
Isaac Connor bb76079d54 fix logic when snapshot.jpg doesn't exist. We need an actual frame, to get a Delta to tell ffmpeg which frame to use. So load the Frame with Score=MaxScore 2018-05-11 10:37:00 -04:00
Isaac Connor b20cb5d0ae Add all the other Event columns to fields 2018-05-11 10:36:14 -04:00
Isaac Connor 230a59cd8e fix case where it wouldn't generate the snapshot.jpg because we hadn't specified whether to show a capture or analysis image 2018-05-11 09:53:24 -04:00
Andrew Bauer 9187d034c1
Merge pull request #2103 from TopView/patch-1 
fixed typo
 2018-05-11 07:35:39 -05:00
Howard 073dd34d65
fixed typo 2018-05-10 20:59:08 -07:00
Isaac Connor 8b8bcbd1e2 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-10 17:47:12 -04:00
Isaac Connor 571b27a025 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-05-10 14:39:16 -04:00
Isaac Connor c61deb422f update to -zm versions 2018-05-10 14:38:49 -04:00
Isaac Connor 2a5f05499e Munge the config in the global configvals into the configs array before returning it. 2018-05-10 13:44:46 -04:00
Isaac Connor b2115f9dcf Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-08 13:34:03 -07:00
Isaac Connor 62edca6dcb add fileSize to the api, and use it to add remote fileSize reporting in includes/Event 2018-05-08 13:33:56 -07:00
Isaac Connor a86b81d12e Only set term_sent_at if we don't already have one, we may send the stop signal many times 2018-05-08 16:08:24 -04:00
Isaac Connor e6d11bf147 block CHLD signals in send_stop, to prevent race condition 2018-05-08 15:52:33 -04:00
Isaac Connor 593167dee6 remove extra code killing processes after KILL_DELAY. check_for_processes_to_kill will kill everything off. 2018-05-08 15:29:34 -04:00
Isaac Connor 62b9662b48 Handle when process is not in cmd_hash 2018-05-08 14:12:53 -04:00
Isaac Connor 3c4befc73a improve Name and Source filtering. Default to case insensitive text search. 2018-05-08 14:07:24 -04:00
Isaac Connor 6bff8811e7 put back logReinit after forko 2018-05-08 12:52:40 -04:00
Isaac Connor 190ac69975 reintroduce FfmpegInterruptCallBack so that av_read_frame can be made to quit 2018-05-08 12:02:08 -04:00
Isaac Connor 5242b17b03 Done restartPending message should be a debug, not Info 2018-05-08 10:30:12 -04:00
Isaac Connor e7bd5900bc rough in a Storage Model 2018-05-07 14:09:05 -07:00
Isaac Connor da7c953e3d adda blank line 2018-05-07 14:08:32 -07:00
Isaac Connor a4911d8f39 use Event object call for file_exists, which will check remotely. Make MissingFiles and ZeroSize be a link to filter results for those events 2018-05-07 14:08:17 -07:00
Isaac Connor 9127eb63dc Implement file_exists function to determine either locally or through remote api calls whether the file for an event exists. 2018-05-07 14:07:30 -07:00
Isaac Connor 1a012c62ff Add fileExists to event view 2018-05-07 14:07:03 -07:00
Isaac Connor 9c44f56f37 Add Storage to belongsTo. Implement Relative_Path and fileExists functions 2018-05-07 14:06:48 -07:00
Isaac Connor 055be6b613 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-07 10:14:04 -07:00
Isaac Connor ced208457d spacing, google code style 2018-05-07 10:13:36 -07:00
Isaac Connor 4f1cc02f58 Merge ../ZoneMinder.master into storageareas 2018-05-07 11:08:10 -04:00
Isaac Connor d31b33ffc6 add a code comment 2018-05-07 11:08:06 -04:00
Isaac Connor cdf53e36e9 Google code style 2018-05-07 11:07:58 -04:00
Isaac Connor b6887c277d google code style 2018-05-07 10:27:40 -04:00
Isaac Connor 8ed015966b add zm_terminate to main while loop 2018-05-07 10:27:26 -04:00
Isaac Connor 4d4a7a4221 Initialize bytes to zero in camera constructor. 2018-05-07 10:27:06 -04:00
Isaac Connor 5772ff9161 return default values for Width and Height 2018-05-05 12:49:00 -04:00
Isaac Connor f2c099f1e4 Merge branch 'master' of github.com:ZoneMinder/ZoneMinder 2018-05-04 16:01:25 -04:00
Isaac Connor d9b6f4bd85 test for value in DBI::errstr 2018-05-04 16:00:55 -04:00
Andrew Bauer 7bc2c6dbc5
Downgrade Unable to send stream to warning 
Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.
 2018-05-04 12:04:28 -05:00
Isaac Connor 375af59657 use unsigned for formatting 2018-05-04 09:58:22 -04:00
Isaac Connor dbdf937a56 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-05-04 06:47:23 -07:00
Isaac Connor 2076508374 add Source and Name filters 2018-05-04 06:47:02 -07:00
Isaac Connor 3fd953a4eb Move code to generate Source from console into Monitor Object 2018-05-04 06:46:46 -07:00