Isaac Connor
|
cd457ae03f
|
Fix eslint
|
2022-04-28 09:17:11 -04:00 |
|
Isaac Connor
|
8bdaaf097c
|
sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js
|
2022-04-27 21:52:48 -04:00 |
|
Isaac Connor
|
bdd2d171c6
|
handle undefined HTTP_REFERER, and escape zone name
|
2022-04-27 21:52:31 -04:00 |
|
Isaac Connor
|
6d1c759dab
|
export the layout id of FreeForm to javascript land
|
2022-04-27 21:51:50 -04:00 |
|
Isaac Connor
|
95590ccd58
|
remove CMD_ and STATE_ defines because they are global now
|
2022-04-27 21:51:07 -04:00 |
|
Isaac Connor
|
8e6f9401c6
|
Scale is now '0' not 'auto'
|
2022-04-27 21:50:40 -04:00 |
|
Isaac Connor
|
001f9a5e9d
|
add statusRefreshTimeout and connKey
|
2022-04-27 21:50:19 -04:00 |
|
Isaac Connor
|
11ea5f2de5
|
Use MonitorStream fo setting img.scale.
|
2022-04-27 21:49:55 -04:00 |
|
Isaac Connor
|
00b80cbe69
|
sync update the style of the surroundin image stream div. Add id and class. Include MonitorStream.js
|
2022-04-27 21:47:24 -04:00 |
|
Isaac Connor
|
3cbca32e36
|
remove #imageFeed style has been moved to global .imageFeed
|
2022-04-27 21:46:17 -04:00 |
|
Isaac Connor
|
e7928a449d
|
Apply .imageFeed img styles globally
|
2022-04-27 21:45:23 -04:00 |
|
Isaac Connor
|
fc78133733
|
Only apply height styles to the stream img.
|
2022-04-27 21:44:55 -04:00 |
|
Isaac Connor
|
f0fb1997db
|
Remove STATE_ and CMD defines as they are in skin.js.php now.
|
2022-04-27 17:47:08 -04:00 |
|
Isaac Connor
|
b37b5fcae9
|
Remove STATE_ and CMD defines as they are in skin.js.php now.
|
2022-04-27 17:46:48 -04:00 |
|
Isaac Connor
|
7a0af0cac1
|
Clear timers around changing img.src. Define statusCmdTime at the top.
|
2022-04-27 17:45:55 -04:00 |
|
Isaac Connor
|
5c96283fd9
|
Remove STATE_ and CMD defines as they are in skin.js.php now. quote connKey so that it retains leading 0s. Should quiet some zms errors.
|
2022-04-27 17:45:08 -04:00 |
|
Isaac Connor
|
ba24a9be02
|
Use MonitorStream functions more in montage, including setStreamScale. Fix behaviour of Width/Height/Scale/Layout buttons.
|
2022-04-27 17:44:09 -04:00 |
|
Isaac Connor
|
6e7f99b7d2
|
remove auth_hash, it is global
|
2022-04-27 17:43:10 -04:00 |
|
Isaac Connor
|
9896b57889
|
split changeScale into applyScale. Fix behaviour when selecting width/height/scale. Fix width:100% not persisting
|
2022-04-27 17:42:51 -04:00 |
|
Isaac Connor
|
6f0c726926
|
remove :'s in labels to be consistent
|
2022-04-27 17:42:02 -04:00 |
|
Isaac Connor
|
67d62a6d01
|
Set width of 200px for cycle sidebar
|
2022-04-27 17:41:43 -04:00 |
|
Isaac Connor
|
c35303fc63
|
remove CMD_ANALYZE and CMD_MAXFPS. They havn't been merged yet
|
2022-04-27 17:41:24 -04:00 |
|
Isaac Connor
|
65c9df9fca
|
Rough in lots of stuff from master. setStreamScale to set src of stream img's. Handle ajax errors better. Send CMD_QUIT when changing img.src. These changes reduce errors from zms.
|
2022-04-27 17:40:51 -04:00 |
|
Isaac Connor
|
2969a00dcb
|
Remove loading=lazy as it causes problems with ajax Querying
|
2022-04-27 17:39:33 -04:00 |
|
Isaac Connor
|
a056c5d1b8
|
Add early test for zm_terminate after processing comms
|
2022-04-27 17:38:48 -04:00 |
|
Isaac Connor
|
6ff0ce4793
|
Add STATE_UNKOWN == -1
|
2022-04-27 17:38:26 -04:00 |
|
Isaac Connor
|
d8ed0d2774
|
Move CMD_ defines to skin.js.php so that they are available everywhere
|
2022-04-27 16:00:47 -04:00 |
|
Isaac Connor
|
3e627a368d
|
setScale to auto
|
2022-04-27 15:46:34 -04:00 |
|
Isaac Connor
|
1a21732e31
|
Remove code handling failure to setStreamStart. This is now ok and handled in runStream
|
2022-04-27 15:17:00 -04:00 |
|
Isaac Connor
|
3089839f83
|
Disconnect and Reconnect in PrimeCapture instead of in constructor and descructor. Fixes camera not reconnecting.
|
2022-04-27 15:16:02 -04:00 |
|
Isaac Connor
|
cc0f095c38
|
Remove check for pktQueue.size(). We know that there are packets in it
|
2022-04-27 15:15:30 -04:00 |
|
Isaac Connor
|
3ae7352c37
|
Remove debugging
|
2022-04-27 15:15:05 -04:00 |
|
Isaac Connor
|
305042ed67
|
Redo the body of event::Run() so that we don't hold the lock while actually processing the packets. Only around queue manipulation. Should free up analysis thread.
|
2022-04-27 10:59:52 -04:00 |
|
Isaac Connor
|
c6f4af0dca
|
Don't exit if we fail to set stream start
|
2022-04-26 14:38:53 -04:00 |
|
Isaac Connor
|
c902433c82
|
Debug log when failed sending
|
2022-04-26 14:38:37 -04:00 |
|
Isaac Connor
|
ff6c0543fb
|
Use notify_all instead of notify_one. If the analysis thread wakes up first, can then wait on packet and decoder won't wake up until next capture
|
2022-04-26 14:36:26 -04:00 |
|
Isaac Connor
|
b819008673
|
Add a notify_all before waiting in case decoder is waiting in packetqueue
|
2022-04-26 14:35:43 -04:00 |
|
Isaac Connor
|
9406aa2ef1
|
set decoded to false, not 0
|
2022-04-26 14:26:41 -04:00 |
|
Isaac Connor
|
ff7b9caf55
|
Move the tests for monitor connectedness down into the main while loop so that we also check for feof etc. The gist is to stay running even if monitor is not running. We will wait for it to come back
|
2022-04-26 14:26:26 -04:00 |
|
Isaac Connor
|
ae42e6d015
|
Fixup UpdateFPS to not use std::chrono stuff. Use packetqueue.unlock which signals. Should fix lockups
|
2022-04-26 14:12:03 -04:00 |
|
Isaac Connor
|
8a048c06da
|
Merge UpdateCaptureFPS and UpdateAnalysisFPS into UpdateFPS and call it from zmc after capture.
|
2022-04-26 13:55:24 -04:00 |
|
Isaac Connor
|
e39e399ea0
|
fix potential double lock of jpeg mutex
|
2022-04-26 12:07:40 -04:00 |
|
Isaac Connor
|
bda9142e7a
|
Add check for deleting or terminating. Decrement packet counts in clear so that debugging makes more sense
|
2022-04-26 12:06:34 -04:00 |
|
Isaac Connor
|
15ec6af3cc
|
Simplify openEvent. Move packetqeue clearing below event closing as packets might be in use
|
2022-04-26 12:05:44 -04:00 |
|
Isaac Connor
|
998ed3753a
|
Put a lock around jpeg writing. libjpeg is not thread safe
|
2022-04-26 12:04:27 -04:00 |
|
Isaac Connor
|
c9557e21c3
|
Code comment reminding us that packets in the event queue are locked.
|
2022-04-26 11:52:15 -04:00 |
|
Isaac Connor
|
d93c9a30a5
|
WARNING should be a DEBUG when restarting a process
|
2022-04-26 10:08:54 -04:00 |
|
Isaac Connor
|
a5fce12f8b
|
Fix logging of next_dts instead of last_dts
|
2022-04-26 10:08:36 -04:00 |
|
Isaac Connor
|
012531daf4
|
Reduce warnings by setting has_warned = false in the correct spot. Add code comments
|
2022-04-26 10:08:17 -04:00 |
|
Isaac Connor
|
12a0b829be
|
Merge branch 'release-1.36' of github.com:ZoneMinder/zoneminder into release-1.36
|
2022-04-25 18:33:47 -04:00 |