8e494ef431
Merge branch 'storageareas' into zma_to_thread
2017-11-23 08:40:49 -05:00
a1fe0c4de3
store the value of saveJpegs in the event
2017-11-21 23:56:22 -05:00
24a0d717c5
wip
2017-11-21 19:55:40 -05:00
7ed495c948
wip
2017-11-21 11:58:15 -05:00
74650ebc70
simplify Analysis
2017-11-20 11:48:56 -05:00
ef5e296144
some fixes
2017-11-17 14:30:38 -05:00
159c0a7165
moer cppcheck fixes
2017-11-17 07:52:26 -05:00
ecc68da0fd
Merge branch 'zma_to_thread' into put_ffmpeg_into_event_wip
2017-11-14 02:39:58 -05:00
56bb2205d8
add mjpeg support
2017-11-14 01:59:15 -05:00
39b12057f2
add saveJPEGs to Events
2017-11-13 21:34:39 -05:00
df0d37f4eb
add saveJPEGS to the event record
2017-11-13 21:29:15 -05:00
e325f5435c
too much refactoring
2017-11-13 10:17:46 -05:00
bb116cebd7
wip
2017-11-09 13:37:02 -08:00
d15d36f389
rework, compiles, won't open h264
2017-11-09 11:50:20 -08:00
ef0379dd18
wip
2017-10-27 20:36:49 -07:00
0265a48a30
fix seg fault, fix pkt pts dts/duration. Stil wrong framerate
2017-10-26 10:12:56 -07:00
3be40bcc99
blah
2017-10-25 13:25:44 -07:00
0fbb473dd4
refactoring
2017-10-25 13:06:15 -07:00
2d3aa08303
include <0 in test on event frame timestamp
2017-10-23 09:56:30 -04:00
b58c9d87c3
wip
2017-10-23 09:51:41 -04:00
666233af54
fix mving capture_file_format to staticCOnfig
2017-10-18 20:46:26 -04:00
ad97023732
spacing
2017-10-12 08:54:43 -07:00
8ea335d45e
whitespace
2017-10-10 15:08:24 -04:00
7b2163f824
add debug
2017-10-10 12:58:06 -04:00
463503b763
mostly comments, deal with negative timestamps
2017-10-09 14:58:07 -04:00
2163099d6b
Merge branch 'storageareas' into zma_to_thread
2017-10-08 09:14:04 -04:00
219b7e0f36
output failing sql
2017-10-08 09:13:56 -04:00
224ca30c86
Merge branch 'storageareas' into zma_to_thread
2017-10-06 17:10:28 -04:00
869d2b4f16
make failure to symlink non-fatal. Someday we may want to use a file store that doesn't do symlinks
2017-09-25 16:22:41 -04:00
da74f8d533
initial turn zma into a thread
2017-07-10 19:37:55 -04:00
c241b6dddd
Merge branch 'split_zmeventstream' into storageareas
2017-06-22 10:46:32 -04:00
226514e887
split EventStream into it's own files
2017-06-22 10:10:28 -04:00
76f63686cb
Merge branch 'fix_event_viewing' into storageareas
2017-06-22 09:24:31 -04:00
5e75588bfb
Fix event viewing. Output a frame immediately on zoom in/out. Fix recursive loop on play/pause
2017-06-21 17:14:02 -04:00
f0d80ddfd4
fix runstate merge
2017-06-13 21:18:09 -04:00
7a67a5e475
fix merge
2017-06-13 21:15:58 -04:00
085d239a6e
Merge branch 'master' into storageareas
2017-06-13 18:02:28 -04:00
bf04a68085
Merge pull request #1752 from connortechnology/filter_by_runstate
...
rough in the ability to filter on RunState
2017-06-12 20:54:17 -05:00
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
01717a5c14
Merge branch 'master' into filter_by_runstate
2017-06-06 20:34:47 -04:00
9534c725d6
Merge branch 'master' into storageareas
2017-06-05 09:21:37 -04:00
187bec40ec
Fix #1906
2017-06-05 09:05:17 -04:00
a515041e14
Merge branch 'master' into storageareas
2017-05-23 15:17:46 -04:00
03495e8c23
fix
2017-05-20 09:54:03 -04:00
1ab8530aed
use enum values to make code more readable. Better error message on event insertion failure
2017-05-20 08:34:46 -04:00
7ecbcd8f12
code documentation
2017-05-20 08:26:55 -04:00
7caeee6bf8
Merge branch 'master' into storageareas
2017-05-19 15:09:44 -04:00
e7ca892efd
merge more differences from SA
2017-05-19 15:07:41 -04:00
91138ba8a1
Merge branch 'master' into storageareas
2017-05-19 14:53:08 -04:00
44e5b6f829
remove redundant code
2017-05-19 14:52:45 -04:00
Isaac Connor
Isaac Connor
Isaac Connor
Isaac Connor
APHW2 MFGENG
Isaac Connor
Andrew Bauer