Commit Graph

11061 Commits

Author SHA1 Message Date
Isaac Connor 2af539e916 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-12 11:39:30 -04:00
Isaac Connor 8518278476 coverity scan fixes/cleanups 2018-04-12 11:29:35 -04:00
Isaac Connor c766c1ddd1 spacing cleanup 2018-04-12 10:28:22 -04:00
Isaac Connor 71d5984eb0 delete stream after use 2018-04-12 10:26:18 -04:00
Isaac Connor ea8a132289 use swscale's new init function 2018-04-12 10:25:06 -04:00
Isaac Connor 65c69d419b google code style and remove throws from constructors and destructors 2018-04-12 10:24:47 -04:00
Isaac Connor c6635b8096 make swscale more robust by moving bits that can fail into an init function instead of the constructor 2018-04-12 10:24:10 -04:00
Isaac Connor 3130a21a28 google code style 2018-04-12 10:23:20 -04:00
Isaac Connor f17c8475be clean up order of declarations 2018-04-12 10:23:10 -04:00
Isaac Connor 3b7992a39b converity scan fixes, and close the .mp4 after updating the db record. 2018-04-12 10:22:46 -04:00
Isaac Connor c466f50255 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-11 13:50:50 -07:00
Isaac Connor 47b871ed9f implement MIN_STREAMING_PORT for Multi-server 2018-04-11 13:50:35 -07:00
Isaac Connor 989ed65f52 spacing and braces, remove a dead unused function 2018-04-11 10:50:28 -04:00
Isaac Connor 22f86da372 Have to use the .sock file instead of w.lock 2018-04-11 10:38:13 -04:00
Isaac Connor 4ec595a98d EventId and FrameId to BIGINT 2018-04-10 13:09:24 -07:00
Isaac Connor db0dac6eb2 Don't use static sql when multiple threads might be using it 2018-04-10 13:06:36 -07:00
Isaac Connor bb924ee078 add report_event_audit 2018-04-10 13:06:01 -07:00
Isaac Connor 03ff2fcde4 add caching and find_one to Storage and Groups 2018-04-10 13:05:37 -07:00
Isaac 06fed41d5a whitespace 2018-04-06 23:21:47 +02:00
Isaac da9d4c2a5c whitespace, don't pre-allocate mFormatContext 2018-04-06 23:21:40 +02:00
Isaac 64cfb39043 do an initial fps report early on 2018-04-06 23:21:22 +02:00
Isaac d8171750cd only call avformat_close_input if mformatContext still has a value. On falure it should have been freed and NULL'd 2018-04-06 23:02:15 +02:00
Isaac Connor ae3ccf6ffe Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-06 12:32:07 -07:00
Isaac Connor fdd8be5daf brackets and spaces 2018-04-06 14:52:56 -04:00
Isaac Connor 74fb8db5e2 make configvals global 2018-04-06 14:52:39 -04:00
Isaac Connor 530ac15344 remove csrf_startup 2018-04-06 14:46:33 -04:00
Isaac Connor 7076ff1b1b Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-06 14:42:30 -04:00
Isaac Connor 7f850890cb whitespace 2018-04-06 14:42:20 -04:00
Isaac Connor 513708b11c don't need to define the config, it will have already been done. Include auth.php instead of functions.php as the code has been moved 2018-04-06 14:42:10 -04:00
Isaac Connor a789fc88aa implement getAuthHash 2018-04-06 14:41:39 -04:00
Isaac Connor 2c02a479d6 remove duplicated config code from bootstrap and just include config.php 2018-04-06 14:38:32 -04:00
Isaac Connor 53ce8c008a move auth functions into it's own file 2018-04-06 14:36:23 -04:00
Isaac Connor 7b23ef80a4 blah 2018-04-06 14:31:11 -04:00
Isaac 6efffe62b8 add c++-11 support for older CMAKE 2018-04-06 19:48:17 +02:00
Isaac 668c515b21 remove unused code that doesn't compile 2018-04-06 19:48:00 +02:00
Isaac Connor 66bb807b3e
Merge pull request #95 from xenoxaos/gapless_playback_fix
changing the querySep in Event.php to allow gapless playback
2018-04-06 11:43:29 -04:00
Isaac Connor 2c85e5e4c6 remove unneccessary type tags. 2018-04-06 11:43:19 -04:00
Mike Brown c4a00e0657 changing the querySep in Event.php to allow gapless playback 2018-04-05 20:42:15 -05:00
Isaac Connor 7a12589a83 Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2018-04-05 13:41:47 -07:00
Isaac Connor f1a8d5f1ff start of work on .41. Adding foreign keysy 2018-04-05 13:41:24 -07:00
Isaac Connor 9ecbba0947 Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas 2018-04-05 14:22:23 -04:00
Isaac Connor 632ab143fe error when can't set session in cake 2018-04-05 14:21:56 -04:00
Isaac Connor 140f11fd58 fix clearing groups 2018-04-05 13:10:25 -04:00
Isaac Connor 2a000cb5f8 fix clearing groups 2018-04-05 13:09:14 -04:00
Isaac Connor 4adebfce1d Add Monitor Status breakdown to console 2018-04-05 09:53:53 -07:00
Isaac Connor 87f5204c46 rename process_configfile to remove namesspace colision 2018-04-05 11:44:21 -04:00
Isaac Connor fb392b2765 put back process_configfile 2018-04-05 11:33:24 -04:00
Isaac Connor b9da309904 remove spaces 2018-04-05 11:33:09 -04:00
Isaac Connor ec5f955d26 more db locking 2018-04-05 11:30:14 -04:00
Isaac Connor fc38fdcc56 remove extra spaces 2018-04-05 11:30:01 -04:00