Isaac Connor
|
6702b10dee
|
remove redundant code and memory leaks
|
2017-11-17 15:37:26 -05:00 |
|
Isaac Connor
|
ef5e296144
|
some fixes
|
2017-11-17 14:30:38 -05:00 |
|
Isaac Connor
|
159c0a7165
|
moer cppcheck fixes
|
2017-11-17 07:52:26 -05:00 |
|
Isaac Connor
|
22ff831859
|
more cppcheck recommendations
|
2017-11-16 21:21:56 -05:00 |
Isaac Connor
|
6a68987ec3
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-16 17:40:29 -08:00 |
|
Isaac Connor
|
778942b928
|
improve add_monitors
|
2017-11-16 17:39:48 -08:00 |
|
Isaac Connor
|
7bff9a8083
|
fix to compile
|
2017-11-16 20:37:40 -05:00 |
|
Isaac Connor
|
2aa252fbd0
|
Merge branch 'storageareas' into zma_to_thread
|
2017-11-16 18:27:44 -05:00 |
|
Isaac Connor
|
0318fb54a6
|
add missing initializers
|
2017-11-16 18:23:02 -05:00 |
|
Isaac Connor
|
7f3d112eb6
|
Merge branch 'tesla' into zma_to_thread
|
2017-11-16 12:07:25 -08:00 |
|
Isaac Connor
|
1686584908
|
more cppcheck fixes
|
2017-11-16 09:19:27 -05:00 |
|
Isaac Connor
|
a956ffe7b3
|
add Copy and =operators to satisfy cppcheck
|
2017-11-16 09:15:04 -05:00 |
|
Isaac Connor
|
d411ed329b
|
get rid of mistyped zmaFPS and zmcFPS
|
2017-11-16 09:14:26 -05:00 |
|
Isaac Connor
|
e23a12b22f
|
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
|
2017-11-16 09:13:51 -05:00 |
Isaac Connor
|
a95a53d6a6
|
Merge pull request #49 from Toasty27/patch-1
Update zm_create.sql.in
|
2017-11-16 07:21:50 -05:00 |
Daniel Hodgson
|
bfd28dda71
|
Update zm_create.sql.in
Added missing column `AnalysisFPS`
|
2017-11-15 17:59:07 -08:00 |
|
Daniel Hodgson
|
087a902698
|
Update zm_create.sql.in
The `CaptureFPS` column is missing in the db creation script, causing errors in the Log whenever a monitor is queried.
|
2017-11-15 17:44:59 -08:00 |
|
Isaac Connor
|
97be2bf0a3
|
fix events js vars, eliminating doing the sql query twice
|
2017-11-15 13:01:07 -05:00 |
|
Isaac Connor
|
f861cfce59
|
Merge 10.34.100.185:ZoneMinder into zma_to_thread
|
2017-11-14 15:33:51 -08:00 |
|
Isaac Connor
|
cca9fb13cc
|
add FPS to console
|
2017-11-14 15:33:31 -08:00 |
APHW2 MFGENG
|
028aa9f161
|
fix segfault
|
2017-11-14 15:32:37 -08:00 |
|
Isaac Connor
|
55eb78c951
|
Merge branch 'zma_to_thread' of github.com:connortechnology/ZoneMinder into zma_to_thread
|
2017-11-14 13:17:55 -08:00 |
|
Isaac Connor
|
bb6e6c18eb
|
add defaults for CaptureFPS and AnalysisFPS
|
2017-11-14 13:17:50 -08:00 |
|
APHW2 MFGENG
|
82b30ef9d0
|
Merge branch 'zma_to_thread' of http://github.com/connortechnology/ZoneMinder into zma_to_thread
|
2017-11-14 13:16:58 -08:00 |
|
APHW2 MFGENG
|
93c79efc72
|
test out more options
|
2017-11-14 13:16:56 -08:00 |
|
Isaac Connor
|
3129afa5d6
|
fixup decoding when recording from a non-ffmpeg suorce
|
2017-11-14 13:16:07 -08:00 |
|
APHW2 MFGENG
|
9563c534a9
|
play around with presets
|
2017-11-14 12:41:25 -08:00 |
|
Isaac Connor
|
bac3fbfce9
|
fix compile on old ffmpeg
|
2017-11-14 08:55:00 -08:00 |
|
Isaac Connor
|
da089bf6e6
|
Merge 10.34.100.185:ZoneMinder into zma_to_thread
|
2017-11-14 08:53:51 -08:00 |
|
APHW2 MFGENG
|
b839151cbc
|
only set orientation if doing pssthrough
|
2017-11-14 08:53:29 -08:00 |
|
APHW2 MFGENG
|
1809921b46
|
turnoff debug
|
2017-11-14 08:53:08 -08:00 |
|
Isaac Connor
|
13ca8435ef
|
Don't go looking for Events to update Diskspace for
|
2017-11-14 08:13:54 -08:00 |
Isaac Connor
|
2b09658f88
|
fixes, set tune to lowlatency
|
2017-11-14 08:41:45 -05:00 |
|
Isaac Connor
|
d5962b11ff
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:48:38 -05:00 |
|
Isaac Connor
|
57c8cdde63
|
Merge branch 'storageareas' into put_ffmpeg_into_event_wip
|
2017-11-14 02:45:34 -05:00 |
|
Isaac Connor
|
93a4dfa3aa
|
remove extra dropdown addition
|
2017-11-14 02:42:51 -05:00 |
|
Isaac Connor
|
65e7fb0014
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:40:12 -05:00 |
|
Isaac Connor
|
ecc68da0fd
|
Merge branch 'zma_to_thread' into put_ffmpeg_into_event_wip
|
2017-11-14 02:39:58 -05:00 |
|
Isaac Connor
|
56bb2205d8
|
add mjpeg support
|
2017-11-14 01:59:15 -05:00 |
|
Isaac Connor
|
bafdf1fdfc
|
add codecs and containers
|
2017-11-13 21:41:57 -05:00 |
|
Isaac Connor
|
39b12057f2
|
add saveJPEGs to Events
|
2017-11-13 21:34:39 -05:00 |
|
Isaac Connor
|
df0d37f4eb
|
add saveJPEGS to the event record
|
2017-11-13 21:29:15 -05:00 |
|
Isaac Connor
|
5717a19215
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:29:01 -05:00 |
|
Isaac Connor
|
99802945fe
|
be able to popup watch view even if the monitor is not running
|
2017-11-13 20:28:18 -05:00 |
|
Isaac Connor
|
1632aa7349
|
fix nvsocket
|
2017-11-13 14:25:19 -08:00 |
|
APHW2 MFGENG
|
043e44d273
|
fix, must clear the frame
|
2017-11-13 14:24:28 -08:00 |
|
Isaac Connor
|
32a27e468d
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-13 11:52:13 -08:00 |
|
Isaac Connor
|
bc3f169a80
|
add event_id as a paramteter
|
2017-11-13 11:51:54 -08:00 |
|
Isaac Connor
|
878e9e4cde
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-13 11:51:01 -08:00 |
|
Isaac Connor
|
ed72017684
|
add a mutex
|
2017-11-13 14:35:47 -05:00 |