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
|
d5962b11ff
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-14 02:48:38 -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
|
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 |
|
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 |
APHW2 MFGENG
|
d07f36a7ee
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-13 10:27:27 -08:00 |
|
APHW2 MFGENG
|
f093cfbcef
|
add Filtering to monitors index
|
2017-11-13 10:27:24 -08:00 |
|
Isaac Connor
|
ecd86b3fde
|
cleanup
|
2017-11-12 15:18:39 -05:00 |
|
Isaac Connor
|
f476c8f2e5
|
fixes from cppcheck
|
2017-11-12 13:25:19 -05:00 |
|
Isaac Connor
|
a99c5b54fa
|
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
|
2017-11-12 13:16:49 -05:00 |
|
Isaac Connor
|
feca6c3df0
|
add a copy constructor at the advice of cppcheck
|
2017-11-12 13:16:18 -05:00 |
|
Isaac Connor
|
71f13a7c9a
|
optimisations/fixes from cppcheck
|
2017-11-12 10:27:47 -05:00 |
|
Isaac Connor
|
4c76b74645
|
decrease debugging
|
2017-11-11 09:11:05 -05:00 |
|
Isaac Connor
|
8694edb1b6
|
add :80 default
|
2017-11-10 16:23:38 -05:00 |
|
APHW2 MFGENG
|
97058065ff
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-10 10:11:03 -08:00 |
|
Isaac Connor
|
57a53f6fdd
|
spacing and fixes
|
2017-11-09 15:03:23 -05:00 |
|
Isaac Connor
|
821717b06e
|
turn off debug
|
2017-11-08 11:26:13 -05:00 |
|
Isaac Connor
|
2570869aa0
|
bring back libvlc
|
2017-11-08 11:18:54 -05:00 |
|
Isaac Connor
|
aba7ecd9a6
|
split lines
|
2017-11-08 11:18:23 -05:00 |
|
Isaac Connor
|
59a87c14d3
|
fix error message
|
2017-11-08 11:17:46 -05:00 |
|
Isaac Connor
|
625170bffc
|
fix getVideoStream to getVideoStreamHTML. Change how scaling works
|
2017-11-08 11:17:30 -05:00 |
|
APHW2 MFGENG
|
402ad0ace3
|
Merge branch 'storageareas' of http://github.com/connortechnology/ZoneMinder into storageareas
|
2017-11-07 18:22:12 -08:00 |
|
APHW2 MFGENG
|
e17bcb9178
|
updates for mast ffmpeg
|
2017-11-07 18:21:51 -08:00 |
|
Isaac Connor
|
b6548ba137
|
put curl back, we use it's decoding function for urls
|
2017-11-07 15:54:13 -05:00 |
|
Isaac Connor
|
a9419064ef
|
don't calc fps if no time has passed
|
2017-11-07 09:35:13 -05:00 |
|
Isaac Connor
|
c3cfd096c7
|
Don't connect to the monitor when doing an eventStream
|
2017-11-07 09:34:47 -05:00 |
|
APHW2 MFGENG
|
2ffa79172a
|
Only load Name,Value when loading config because that's all we use
|
2017-11-06 08:36:53 -08:00 |
|
APHW2 MFGENG
|
c2fab6e959
|
add the options for nvsocket as an include
|
2017-11-06 07:31:08 -08:00 |
|
Isaac Connor
|
4b8a8e7b56
|
fix new return value from Capture, 1 signals 1 frame captured
|
2017-11-05 18:02:09 -05:00 |
|
Isaac Connor
|
bef7c0ed94
|
Only start a monitor if it has a Function
|
2017-11-05 11:54:00 -05:00 |
|
Isaac Connor
|
7374ced076
|
0 is a prefectly valid PreEventCount
|
2017-11-05 10:00:24 -05:00 |
|
Isaac Connor
|
0a3327e2d2
|
move test for h264 into the code that opens the stream instead of comparing on every capture
|
2017-11-05 09:59:27 -05:00 |
|
Isaac Connor
|
ee96f58ac4
|
fix fps reporting value when Capture doesn't return a new frame
|
2017-11-05 09:59:06 -05:00 |
|
Isaac Connor
|
09f3355e18
|
add /usr/share/zoneminder/www/cache as a temp dir
|
2017-11-04 14:52:36 -04:00 |
|
Isaac Connor
|
63c788ef0e
|
handle when sql error occurs and no params given
|
2017-11-03 15:45:11 -04:00 |
|
Isaac Connor
|
f39353a4a3
|
add missing breaks
|
2017-11-03 15:44:53 -04:00 |
|
Isaac Connor
|
8432ab5938
|
change quotes, and limit the # of results to 2 when getting next and previous frames. 2 is because one of them could be the currently selected Event,
|
2017-11-03 15:09:19 -04:00 |
|
Isaac Connor
|
0ef5c16bcc
|
when doing parseSort, reset the sortfield to StartTime instead of DateTime
|
2017-11-03 15:07:04 -04: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
|
54d77519c0
|
Only show Storage and Server filters if there is more than 1
|
2017-11-03 12:03:01 -04:00 |
|
Isaac Connor
|
67bb8c302f
|
add missing /
|
2017-11-03 10:00:29 -04:00 |