Isaac Connor
|
71ad08613e
|
fix
|
2017-01-05 11:30:01 -05:00 |
|
Isaac Connor
|
d1ed472db0
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-01-05 10:09:11 -05:00 |
Isaac Connor
|
5ae34a7561
|
Merge branch 'master' into storageareas
|
2017-01-02 09:39:10 -05:00 |
Andy Bauer
|
254fcbcef7
|
update gpl 2 mailing address in source files
|
2016-12-26 09:23:16 -06:00 |
|
Isaac Connor
|
d97c1f1cff
|
Merge branch 'fix_braces' into storageareas
|
2016-12-08 14:58:38 -05:00 |
|
Isaac Connor
|
7f2bf04c2f
|
Merge branch 'cookie_http_only' into storageareas
|
2016-12-08 14:26:13 -05:00 |
|
Isaac Connor
|
c27a18a758
|
fix braces in zm_monitor.cpp
|
2016-12-08 11:49:54 -05:00 |
|
Isaac Connor
|
1a25b957ad
|
check for and create events dir for monitor on Object instantiation
|
2016-11-27 20:10:12 -05:00 |
|
Andy Bauer
|
873bb9902b
|
recalculating zmswap at this point is unnesessary
|
2016-11-19 08:53:17 -06:00 |
|
Andy Bauer
|
3afa8937d8
|
calculate string lengths and array ndx's properly
|
2016-11-19 08:52:22 -06:00 |
Isaac Connor
|
2bd080a6a6
|
Merge branch 'master' into storageareas
|
2016-11-15 08:41:00 -05:00 |
|
Andy Bauer
|
d3a7fca079
|
only unlink if zmc is being destroyed
|
2016-11-14 19:01:00 -06:00 |
|
Andy Bauer
|
6c7d71361a
|
unlink the mmap file when the monitor object is destroyed
|
2016-11-13 16:40:54 -06:00 |
|
Isaac Connor
|
420d141bc7
|
split the reading of max fps and alarm max fps to remove an extra atof and make them more understandable
|
2016-10-18 09:50:01 -04:00 |
|
Isaac Connor
|
9656a7c3e8
|
Store Oriention on event creation
|
2016-10-12 09:12:09 -04:00 |
|
Isaac Connor
|
85dd5ea00c
|
do the videostore test in the constructor
|
2016-09-26 20:08:09 -04:00 |
|
Isaac Connor
|
bd22d72e18
|
cleanups, code style, free resample_context
|
2016-09-26 11:01:47 -04:00 |
|
Isaac Connor
|
bd076fed69
|
Merge branch 'storageareas' into packetqueue
|
2016-09-16 09:56:41 -04:00 |
|
Isaac Connor
|
85b2ba73ab
|
change the behaviour of StorageID. Now it will NOT NULL default 0 and a value of 0 means use ZM_EVENTS_PATH
|
2016-09-14 09:31:57 -04:00 |
|
Isaac Connor
|
88d86afd85
|
Merge ../ZoneMinder.master into storageareas
|
2016-09-13 10:02:53 -04:00 |
|
Isaac Connor
|
2bc5742aec
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-09-13 09:53:39 -04:00 |
|
Isaac Connor
|
39e06b929f
|
add braces and only call closeEvent if there is an event
|
2016-09-13 09:36:45 -04:00 |
Steve Gilvarry
|
fc060135fe
|
Move our recording flag deeper into closeevent
|
2016-09-13 22:58:38 +10:00 |
|
Isaac Connor
|
d0fb2acfaa
|
rename videowriterprefs to videowriter. Use an enum to for videowriter values to make code easier to read. Add some comments
|
2016-09-12 21:35:14 -04:00 |
|
Isaac Connor
|
3a06ba7a65
|
Turn off instantiating a default zone before even loading the zones. Implement the use of Camera->setMonitor so that the camera object doesn't have to load it later.
|
2016-09-09 09:15:04 -04:00 |
|
Isaac Connor
|
824d7c5b43
|
Merge ../ZoneMinder.Steve into packetqueue
|
2016-08-31 11:58:22 -04:00 |
|
Isaac Connor
|
55c6e5a6db
|
cleanup putting packetqueue in the monitor. It should be in the camera
|
2016-08-31 11:47:42 -04:00 |
|
Steve Gilvarry
|
d1bcb14629
|
Right direction
|
2016-09-01 00:00:10 +10:00 |
|
Steve Gilvarry
|
44df4a830d
|
Merge branch 'feature-h264-videostorage' into monitor_packetqueue
|
2016-08-11 20:44:48 +10:00 |
|
Isaac Connor
|
6ac1a70b9c
|
Merge my Rotation/Orientation work and fixes for bad h264 streams
|
2016-08-10 12:22:04 -04:00 |
|
Isaac Connor
|
14d8496972
|
add NULL test for RTSPDesribe
|
2016-07-14 10:27:24 -04:00 |
Isaac Connor
|
6644db3bea
|
check for null on various Monitor fields
|
2016-06-24 10:29:50 -04:00 |
|
Isaac Connor
|
081c0add72
|
fix
|
2016-06-23 11:25:50 -04:00 |
|
Isaac Connor
|
ccea620531
|
check for null before instantiating strings
|
2016-06-23 11:13:26 -04:00 |
|
Isaac Connor
|
c6761dd094
|
fix merge
|
2016-06-21 14:02:36 -04:00 |
|
Isaac Connor
|
e29a0ebe71
|
Merge branch 'feature-h264-videostorage' into storageareas
|
2016-06-21 13:48:32 -04:00 |
|
Isaac Connor
|
6a8db582ff
|
whitespacing updates
|
2016-06-21 12:21:18 -04:00 |
Isaac Connor
|
fad1d95011
|
fix NULL in linkedMonitors column
|
2016-06-09 13:06:57 -04:00 |
|
Isaac Connor
|
d9f2911f0d
|
handle null values in Monitors columns
|
2016-06-09 12:51:22 -04:00 |
|
Steve Gilvarry
|
0abfb7378a
|
Buffer work
|
2016-05-18 00:01:33 +10:00 |
|
Isaac Connor
|
943a4cef73
|
Merge branch 'storageareas' into rotate_video
|
2016-05-13 15:00:50 -04:00 |
|
Isaac Connor
|
71e9553648
|
add rotation to video
|
2016-05-13 14:51:26 -04:00 |
|
Isaac Connor
|
18461b0c64
|
Add some debugging
|
2016-05-06 12:39:10 -04:00 |
|
Isaac Connor
|
88a0bdc026
|
Add some code comments. Make mocord always honour section_length
|
2016-05-05 14:51:26 -04:00 |
|
Steve Gilvarry
|
da157f5a1a
|
Merge remote-tracking branch 'upstream/master' into feature-h264-videostorage
|
2016-04-30 22:27:10 +10:00 |
|
Isaac Connor
|
5eebc50bfb
|
tabs to spaces
|
2016-04-29 08:57:31 -04:00 |
|
Isaac Connor
|
097e7f3906
|
Merge branch 'master' into storageareas
|
2016-04-28 16:40:44 -04:00 |
|
Isaac Connor
|
30b3fa8a8b
|
add a cast to help the compile figure out which function to use
|
2016-04-28 12:57:38 -04:00 |
|
Isaac Connor
|
fac07cba6d
|
Merge branch 'master' into tabs_to_spaces
|
2016-04-28 09:31:40 -04:00 |
|
Isaac Connor
|
629f141734
|
Merge pull request #1441 from SteveGilvarry/remove_commented_code
Delete large commented out code segment
|
2016-04-28 09:30:43 -04:00 |