Commit Graph

21 Commits

Author SHA1 Message Date
Isaac Connor d5962b11ff Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas 2017-11-14 02:48:38 -05:00
Isaac Connor cab8c4cd5e cleanup Monitor::Capture. Cleanup the return values from Capture and CaptureAndRecord. <0 is error, 0 is things ok, but no video frame. > 0 means we have a frame. Plus google code style 2017-11-03 13:49:42 -04:00
Isaac Connor ab1c9f7c98 add more debugging 2017-10-31 16:27:43 -04:00
Isaac Connor df14b3c812 handle failure to connect to zmc in zms gracefully 2017-10-24 16:22:26 -07:00
Isaac Connor fece06c9e3 google code style 2017-10-19 17:12:36 -04:00
Isaac Connor 0d8e4656dc fix braces 2017-06-26 09:46:07 -04:00
Andrew Bauer bacf65ae9a Migrate values from Options -> Paths to zm.conf (#1908)
* initial commit to migrate contents of Options->Paths to zm.conf

* remove paths items from configdata.pm

* remove paths tab from options

* update deb packaging scripts with new cmake vars

* remove extraneous file

* save custom paths variables to config file before dB is freshened

* don't check configs if the dB version is >= 1.31.0
2017-06-12 21:39:37 -04:00
Isaac Connor bb50784ed2 braces 2017-05-20 09:53:35 -04:00
Andy Bauer 254fcbcef7 update gpl 2 mailing address in source files 2016-12-26 09:23:16 -06:00
Isaac Connor 2385575c56 fix +1 being outside bind() 2016-06-02 16:23:04 -04:00
Isaac Connor 435a1f7a2e remove duplicated locking code created by bind_fixes 2016-05-17 09:11:52 -04:00
Isaac Connor 341ebc7b45 Merge branch 'master' into bind_fixes 2016-05-02 12:39:55 -04:00
Isaac Connor 0dc2987b84 add some error checking, but fix the call to bind which really should have a +1 in it. 2016-04-28 16:32:50 -04:00
Isaac Connor 03b1ced568 tabs to spaces and use 2space indenting 2016-04-04 10:11:48 -04:00
Isaac Connor a16c1746e5 separate a failure to open versus failure to lock. Quiets coverity because close can't handle a negative value 2016-03-24 10:00:02 -04:00
Isaac Connor 0fc68e2e91 delete lock when we are done with it 2015-12-04 16:38:24 -05:00
Isaac Connor be36301779 use exclusive lock, add includes 2015-12-04 16:35:27 -05:00
Isaac Connor e637915823 add a lock around the socket creating/deleting. 2015-12-04 15:39:37 -05:00
Isaac Connor 07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -04:00
POKKAHOH 33b6e5cd03 Now can recive RTSP stream.
Decode fragmented NAL
Understand sprop-parametr-sets
Don't check unsetted video format (zm_remote_camera_rtsp.cpp)
2013-09-27 15:08:11 +04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00