Isaac Connor
8223d6ed15
When closing event, on first update, only update if Name has not been changed. If so, do the update without setting the Name.
2020-09-25 15:29:31 -04:00
Isaac Connor
795e98a09c
Merge pull request #2916 from connortechnology/zone_optimise
...
Improve code in zm_zone
2020-09-22 17:48:24 -04:00
Isaac Connor
98aad6abbc
Make status UNKNOWN be -1 so that zmu -s retains backwards compatibility. Fixes #3048
2020-09-21 14:25:41 -04:00
Isaac Connor
d843ef89f6
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-09 15:07:46 -04:00
Isaac Connor
30e9924601
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2020-09-09 12:55:13 -04:00
Isaac Connor
53fe4c7f1b
Handle error conditions
2020-09-09 12:55:08 -04:00
Isaac Connor
a4b83b0e99
Merge branch 'master' of github.com:zoneminder/ZoneMinder
2020-09-09 12:13:54 -04:00
Isaac Connor
6bfd7c5e14
log referer when unable to authenticate
2020-09-09 12:13:28 -04:00
Isaac Connor
7b52237593
spacing and correct a libvlc=>libvncclient
2020-09-09 10:25:55 -04:00
Isaac Connor
eadd9dd4f4
spacing
2020-09-07 13:28:45 -04:00
Isaac Connor
4126f96b40
clean up sendFrame a bit introducing send_file and send_buffer utility functions
2020-09-07 11:19:47 -04:00
Isaac Connor
f3873d65e4
remove debug
2020-09-02 17:33:38 -04:00
Isaac Connor
77b978ed26
Handle non-connected monitor in processCmd. Quit when zm_terminate in checkInitiialized loop
2020-09-02 17:22:39 -04:00
Isaac Connor
794474afab
Add UNKNOWN status type. test for shared_data in ShmValid()
2020-09-02 17:22:00 -04:00
Isaac Connor
3a9cec8e4d
We no longer care about not being able to connect to the monitor.
2020-09-02 16:37:11 -04:00
Isaac Connor
ea3fcb16a6
Changes to not just die if not connected to monitor. Instead wait around spitting out an error image.
2020-09-02 16:36:05 -04:00
Isaac Connor
43e1ac2ad4
Send Text frame when unable to connect to the monitor.
2020-09-02 16:35:27 -04:00
Isaac Connor
f60d6ff1a3
Use BOUNDARY instead of ZoneMinderFrame
2020-09-02 16:34:56 -04:00
Isaac Connor
4d5d2ecd5d
Merge pull request #3030 from Carbenium/nullptr
...
Convert NULL/0 to nullptr
2020-08-26 16:54:28 -04:00
Peter Keresztes Schmidt
8f980a1168
Convert NULL/0 to nullptr
...
The 0 -> nullptr changes should definitely improve readability.
2020-08-26 22:03:40 +02:00
Peter Keresztes Schmidt
06dfe9b987
Extract generated part of zm_config.h into zm_config_data.h
...
With this change IDEs have it easier to correctly reference the
variable/class declarations. Additionally one does not have to
regenerate the zm_config.h file when changing the code.
2020-08-25 23:33:56 +02:00
Peter Keresztes Schmidt
394426cca2
zm_config: Fix a -Wwrite-string warning
...
For reference:
/home/peterke/DEV/zoneminder/build/src/zm_config.h:31:26: warning: ISO C++ forbids converting a string constant to ‘char*’ [-Wwrite-strings]
2020-08-25 20:51:42 +02:00
Andrew Bauer
e5e2c3b347
fix stats off by 1 frame, don't alert on score 0
2020-08-24 10:57:54 -05:00
Isaac Connor
08aee63f66
Don't need a variable can just pass the define
2020-08-22 11:36:07 -04:00
Andrew Bauer
a0bc60ceda
change not enabling ffmpeg msg to debug
2020-08-18 10:34:07 -05:00
Andrew Bauer
ccda2b3707
EPIPE sets zm_terminate so no need to check
2020-08-18 09:37:21 -05:00
Andrew Bauer
62d687adfa
dont warn or error for EPIPE errno's
2020-08-18 09:30:06 -05:00
Isaac Connor
610f73a835
Merge branch 'release-1.34'
2020-08-17 19:30:32 -04:00
Isaac Connor
e5dda8d142
Include avutils/imgutils.h to support compile on libav-tools
2020-08-16 14:56:52 -04:00
Andrew Bauer
09b12a7dac
Remove extra space in event name
2020-08-13 10:51:10 -05:00
Isaac Connor
d42424d6d8
Merge branch 'release-1.34'
2020-08-11 11:41:11 -04:00
Isaac Connor
afae319c94
Fix MOCORD not going into ALARM state.
2020-08-11 11:02:26 -04:00
Isaac Connor
bf2cb5fb1f
Add PrimeCapture to zm_remote_camera_http. PrimeCapture is used to determine if we can connect and so by not implementing it, monitors like this say capturing even though they are not.
2020-08-08 10:21:06 -04:00
Andrew Bauer
98f315951e
Merge pull request #3003 from marillat/patch-1
...
Don't prefix manpage with zoneminder-
2020-08-07 12:34:30 -07:00
dmo
ed496e74fc
Update CMakeLists.txt
2020-08-07 07:54:58 +02:00
Isaac Connor
a19990f4d7
Merge branch 'release-1.34'
2020-08-06 11:57:35 -04:00
Isaac Connor
302189a65e
Don't use camera->LineSize when allocating shared images. It doesn't work because other processes don't know about it.
2020-08-06 10:11:00 -04:00
Isaac Connor
4d4fab46d6
Spacing, use FFMpegInit instead of deprecated ffmpeg calls
2020-08-05 19:17:00 -04:00
Isaac Connor
b867d0c463
Fix image copy when line sizes are not the same.
2020-08-05 11:33:22 -04:00
Isaac Connor
be05040a47
fix rotated images
2020-07-30 19:50:25 -04:00
Isaac Connor
05107bb2f7
Add debug of unused options
2020-07-30 15:16:31 -04:00
Isaac Connor
d8cd4386cf
rename GetOptEncoderParams to GetOptEncoderParams to GetOptEncoderParamsVec so that we can get at the std::string if we want to.
...
Use EncoderParams when setting movflags in VideoStore.
Move the content of this option to a help popup so that we can remove the comments from it. av_dict_parse doesn't handle the hash tag as a comment.
2020-07-30 15:06:05 -04:00
Isaac Connor
2f57ccc9b9
Merge branch 'release-1.34'
2020-07-29 16:27:01 -04:00
Isaac Connor
4ed0ad26a7
bail early if fwrite fails
2020-07-29 14:01:52 -04:00
Isaac Connor
b1054a7db6
bail earlier if writing content-length fails. Dropped connections aren't really errors, make them Info. Fixes #2996
2020-07-29 13:39:00 -04:00
Isaac Connor
7511b1fd7e
Fix for saving jpegs
2020-07-25 14:25:45 -04:00
Isaac Connor
859428db51
remove debug
2020-07-24 15:42:53 -04:00
Isaac Connor
f4a0f91d7f
nothing
2020-07-24 15:27:05 -04:00
Isaac Connor
1f889bd086
def don't use linesize when allocating share images
2020-07-24 15:26:48 -04:00
Isaac Connor
4ecfa32601
remove uneccessary multiplications from jpeg compression.
2020-07-24 15:26:28 -04:00
