Jonathan Bennett
|
a2a2f1a781
|
Move variables out of the ifdef gsoap block, as they are used for Amcrest support, too
|
2022-01-25 22:46:09 -06:00 |
|
Jonathan Bennett
|
57a697093e
|
Remove redundant JS define
|
2022-01-25 22:38:06 -06:00 |
|
Jonathan Bennett
|
ec9403fb6f
|
Adds Amcrest On-camera Motion Detection
|
2022-01-25 22:38:00 -06:00 |
Isaac Connor
|
f10d0fd3f5
|
Merge pull request #3413 from jp-bennett/master
Adds janus updates
|
2022-01-23 12:35:42 -05:00 |
|
Jonathan Bennett
|
5485c04bc6
|
Rework of the Janus polling loop
|
2022-01-23 01:07:48 -06:00 |
|
Jonathan Bennett
|
d110987935
|
Fix indentation for ESLint
|
2022-01-22 13:37:44 -06:00 |
|
Jonathan Bennett
|
abbd27d1cb
|
Remove hard-coded config Vars
|
2022-01-22 13:31:47 -06:00 |
|
Jonathan Bennett
|
07c5b23aa6
|
Adds Janus streaming checks to polling thread
|
2022-01-22 12:49:08 -06:00 |
|
Isaac Connor
|
9443aaa2d8
|
Do state changes when in RECORD mode as well as it doesn't do motion detection Fixes #3411
|
2022-01-22 13:33:39 -05:00 |
|
Jonathan Bennett
|
8125aa633b
|
Merge branch 'ZoneMinder:master' into master
|
2022-01-22 12:20:13 -06:00 |
|
Isaac Connor
|
90f75dae93
|
Make config entries const
|
2022-01-22 12:33:48 -05:00 |
|
Isaac Connor
|
47aa1d1913
|
Bump version to 1.37.10
|
2022-01-22 12:31:56 -05:00 |
|
Isaac Connor
|
3a0b88c013
|
Don't make private config entries available to js land.
|
2022-01-22 12:31:36 -05:00 |
|
Isaac Connor
|
ce2d605b3d
|
load Private as well as Name,Value from Config
|
2022-01-22 12:31:15 -05:00 |
|
Isaac Connor
|
35efb111ac
|
Add Private to Config
|
2022-01-22 12:30:59 -05:00 |
|
Isaac Connor
|
45db266ede
|
Put full config available to javascript
|
2022-01-22 12:07:18 -05:00 |
|
Jonathan Bennett
|
2e9bda1af1
|
Add firefox specific workaround for Janus streaming
|
2022-01-21 23:21:41 -06:00 |
|
Jonathan Bennett
|
52e48c02b6
|
Add janus_path and janus_secret, allowing for more secure and flexible Janus installs
|
2022-01-21 22:23:41 -06:00 |
Isaac Connor
|
4eb4e0eb18
|
ignore ajaxQueue.js
|
2022-01-20 12:02:17 -05:00 |
|
Isaac Connor
|
5ce701f5cb
|
Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:53:44 -05:00 |
|
Isaac Connor
|
91d6ff2029
|
Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:53:35 -05:00 |
|
Isaac Connor
|
57bb91e105
|
add connKey to monitorData
|
2022-01-20 11:53:05 -05:00 |
|
Isaac Connor
|
9c3509a620
|
put an mid in imageFeed id so we can use MOnitorStream.js. Use Monitor->getStatusHTML to generate status html
|
2022-01-20 11:52:54 -05:00 |
|
Isaac Connor
|
e73659843a
|
Rework to use MonitorStream.js
|
2022-01-20 11:52:01 -05:00 |
|
Isaac Connor
|
7748616992
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:51:08 -05:00 |
|
Isaac Connor
|
24a9dcbf47
|
If rate > 1600, limit it to 1600 to prevent logged errors
|
2022-01-20 11:50:53 -05:00 |
|
Isaac Connor
|
97f2c0a02b
|
Load ajaxQueue
|
2022-01-20 11:50:25 -05:00 |
|
Isaac Connor
|
2da9c20c08
|
Add ajaxQueue
|
2022-01-20 11:49:59 -05:00 |
|
Isaac Connor
|
22b6337752
|
Merge code from watch.js. Add an ajaxQueue. Link up buttons from UI
|
2022-01-20 11:47:28 -05:00 |
|
Isaac Connor
|
4bf55b1af1
|
Use net zm_setcookie
|
2022-01-20 09:48:09 -05:00 |
|
Isaac Connor
|
3cd6fbdc12
|
Use net zm_setcookie
|
2022-01-20 09:48:02 -05:00 |
|
Isaac Connor
|
9395b7e47c
|
Use net zm_setcookie
|
2022-01-20 09:47:53 -05:00 |
|
Isaac Connor
|
a57206ef54
|
Implement getMonitorStateHTML to synchronize it between montage and live view, cycle etc. Reuseable code. Also the structure is required by MonitorStream.js
|
2022-01-20 09:47:36 -05:00 |
|
Isaac Connor
|
db866fa668
|
Implement zm_setcookie to simplify setting cookies, set samesite, deal with older php etc. Use it.
|
2022-01-20 09:46:38 -05:00 |
|
Isaac Connor
|
dec440ead1
|
Unset holdbuffer so that when we connect, we reset the shm buffer pointer. cleanup initializers in Image
|
2022-01-19 15:01:37 -05:00 |
|
Isaac Connor
|
05043a37b1
|
include image index in debug
|
2022-01-19 12:27:16 -05:00 |
|
Isaac Connor
|
062cde54a0
|
Bump version for janus audio
|
2022-01-19 10:45:38 -05:00 |
|
Isaac Connor
|
ebcb3abf2e
|
image_count is only relevant to capture. decode and analysis should use packet->image_index for indexing into image_buffer, etc.
|
2022-01-19 09:33:33 -05:00 |
|
Isaac Connor
|
e6edf5b7db
|
Merge pull request #3410 from jp-bennett/master
Adds janus_enable_audio, a switch to try to enable audio in live stre…
|
2022-01-19 09:32:22 -05:00 |
|
Jonathan Bennett
|
04cfe372f8
|
Wrap public access function in Gsoap ifdef to remove build warning
|
2022-01-19 00:56:36 -06:00 |
|
Jonathan Bennett
|
fb832e7d1b
|
Adds janus_enable_audio, a switch to try to enable audio in live stream viewing.
|
2022-01-19 00:14:52 -06:00 |
|
Isaac Connor
|
d00aaa11e9
|
default JanusEnabled to 0 so that we can turn it off
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
388735e942
|
Fix relating auth_hash causing repeated reloads. If https, then assume a reverse proxy setup to janus. If video feed is not an img, log it and return
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
13ee39b1e9
|
Log errors talking to Janus. Log if janus is turned on but not compiled in
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
d2d9721c4e
|
spacing, remove redundant debug
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
3241fa59c5
|
Don't redirect if there was an error so that we display it
|
2022-01-18 23:02:26 -05:00 |
|
Isaac Connor
|
0c055edb5e
|
I think in all my changes I got rid of the code that opens events on Alarm.
|
2022-01-18 12:20:19 -05:00 |
|
Isaac Connor
|
90492d332c
|
Put back to brand 3.0 of upstream
|
2022-01-18 10:39:24 -05:00 |
|
Isaac Connor
|
24c2efeb00
|
fix eslint
|
2022-01-17 16:19:27 -05:00 |
|
Isaac Connor
|
eab29babea
|
Merge pull request #3409 from jp-bennett/master
Refactor Montage view js -- Janus in MonitorStream
|
2022-01-17 15:14:43 -05:00 |