0dbc39ee25
Cleanup and reorganize includes
...
With this commit a unified structure for includes is introduced.
The general rules:
* Only include what you need
* Include wherever possible in the cpp and forward-declare in the header
The includes are sorted in a local to global fashion. This means for the include order:
0. If cpp file: The corresponding h file and an empty line
1. Includes from the project sorted alphabetically
2. System/library includes sorted alphabetically
3. Conditional includes
2021-02-04 18:02:01 +01:00
09d8dbb460
spacing
2021-02-02 23:19:53 -05:00
c0a2286dee
Code style
2021-01-08 15:49:21 -05:00
48d9b4d5a5
Remove unused variables
2020-12-23 18:50:52 -05:00
50e1e4391a
Include capture_fps and analysis_fps in status
2020-12-09 15:00:29 -05:00
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
4f178e47bc
Break early after setting zm_terminate so that zms quits faster. Use a basic assignment instead of memcpy for last_frame_timestamp
2020-11-19 16:39:53 -05:00
df783f4835
Merge branch 'master' into zma_to_thread
2020-11-12 12:53:55 -05:00
a857f677a6
cppcheck fixes, mostly %d->%u
2020-11-02 12:45:48 -05:00
a39a656373
Merge branch 'master' into zma_to_thread
2020-09-29 11:02:40 -04:00
77b978ed26
Handle non-connected monitor in processCmd. Quit when zm_terminate in checkInitiialized loop
2020-09-02 17:22:39 -04:00
43e1ac2ad4
Send Text frame when unable to connect to the monitor.
2020-09-02 16:35:27 -04:00
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
ccda2b3707
EPIPE sets zm_terminate so no need to check
2020-08-18 09:37:21 -05:00
62d687adfa
dont warn or error for EPIPE errno's
2020-08-18 09:30:06 -05:00
5fb56c9f57
Merge branch 'master' into zma_to_thread
2020-08-07 17:52:43 -04:00
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
859428db51
remove debug
2020-07-24 15:42:53 -04:00
f4a0f91d7f
nothing
2020-07-24 15:27:05 -04:00
869860bb26
Merge branch 'master' into zma_to_thread
2020-07-21 17:49:39 -04:00
7575afc8d5
Merge branch 'master' into zma_to_thread
2020-07-21 17:38:32 -04:00
e675c8373e
Merge branch 'release-1.34'
2020-07-07 16:15:56 -04:00
c79c65e72e
spacing fixes
2020-07-07 16:14:57 -04:00
4ff341a0f5
Merge branch 'master' into zma_to_thread
2020-05-02 18:03:42 -04:00
17356a7b3a
Use a BOUNDARY define to construct boundary strings. Get rid of code that kills zms when the frame rate drops too low, as dying doesn't help, and some cameras just have a really low frame rate.
2020-04-14 17:01:12 -04:00
9193ef4a62
Send the first frame twice to fix low framerate display in Chrome
2020-04-14 16:44:03 -04:00
f065daf940
spacing, move some variables deeper in scope, merge fprintf calls
2019-12-29 16:46:30 -05:00
09fcbad666
Merge branch 'master' into zma_to_thread
2019-11-30 14:59:39 -05:00
b787682fa9
Fix play from pause when not buffering. When change of zoom, send two paused images so that response is instant. Fix some misplaced line feeds.
2019-09-26 13:51:13 -04:00
396be10d6f
Merge branch 'master' into zma_to_thread
2019-08-22 12:57:00 -04:00
90cb5d018a
Fix 2673 ( #2675 )
...
* Change MaxFPS to DECIMAL(5,3) to handle values like 1/60 = 0.017
* When fps < 1 we may need to wait longer than 10s. Also, we cannot sleep for a long time, because we may need to send a keep alive or check the command queue. So limit the sleep to 1s
* Bump version
* Update MaxFPS to Decimal(5,3)
* Fix missing ;
2019-07-31 11:42:38 -04:00
4b8a2a94e3
reduce frame send time too slow to a warning instead of error
2019-06-05 10:12:56 -04:00
fee95c2316
ifdef HAVE_ZLIB_H around code that uses Image->Zip
2019-05-03 09:04:31 -04:00
62d95e4d6e
wip deprecate a lot of the index code. We are basically just using imag_buffer[0] for current image
2019-02-26 09:45:20 -05:00
448294f593
wip
2019-02-25 10:21:43 -05:00
a9e2011727
Merge branch 'storageareas' into zma_to_thread
2019-02-13 12:24:38 -05:00
189e78b42d
add comments and a test for zm_terminate in the checkCommandQueue while loop
2019-01-21 13:29:20 -05:00
5ab1126260
Merge branch 'storageareas' into zma_to_thread
2018-10-20 17:31:14 -04:00
c7f9ffa521
Merge pull request #2217 from connortechnology/touch_lockfile
...
Touch lockfile
2018-10-11 08:45:09 -05:00
94796aea2c
Always make SWAP_PATH dir as under systemd it may be chrooted
2018-09-23 16:49:57 -04:00
c8549e41da
touch the zms lock file every hour so that we can determine which ones are stale
2018-09-21 15:58:14 -04:00
672b4affe1
Merge branch 'storageareas' into zma_to_thread
2018-08-31 19:05:22 -04:00
df3da6dd93
Merge branch 'storageareas' of github.com:ConnorTechnology/ZoneMinder into storageareas
2018-08-30 14:53:39 -04:00
0eaa539dc6
ZM_SWAP_PATH may not exist, so always try to create it
2018-08-30 14:53:27 -04:00
979b31ffc3
Merge branch 'storageareas' into zma_to_thread
2018-08-11 10:08:30 -04:00
934ce654f9
Merge branch 'storageareas' of github.com:connortechnology/ZoneMinder into storageareas
2018-06-08 15:21:43 -04:00
c3053a2f8a
Merge branch 'storageareas' into zma_to_thread
2018-05-10 17:51:38 -04:00
7bc2c6dbc5
Downgrade Unable to send stream to warning
...
Downgraded this from en Error to a Warning. This message can trigger following the normal closing of a monitor. Thus, it's not necessarily an error.
2018-05-04 12:04:28 -05:00
cd3046abb3
Merge branch 'storageareas' into zma_to_thread
2018-04-14 11:03:08 -04:00
Peter Keresztes Schmidt
Isaac Connor
Andrew Bauer
Isaac Connor