Isaac Connor
cc33718a2e
fix did you forget to declare my $deleteLogByRowsSth?)
2021-04-01 12:22:30 -04:00
Isaac Connor
1fd9361e4e
use zmDbDo to replace many lines of code
2021-04-01 09:27:49 -04:00
Isaac Connor
757ec2dbc1
Improve zmDbDo to return rows affected instead of boolean
2021-04-01 09:27:20 -04:00
Isaac Connor
9f5bc8b2b9
Merge pull request #3174 from akeyx/3173-bugfix-fix-onvif-control
...
3173 bugfix fix onvif control
2021-03-30 18:38:00 -04:00
Isaac Connor
dedf42371b
copy onvif.pm which isn't actually onvif to FoscamCGI.pm We will later replace onvif.pm with an Actual onvif implementation.
2021-03-30 18:32:42 -04:00
Isaac Connor
d54ba9b324
Change url used for authentication to magicBox.cgi?action=getDeviceType
2021-03-30 16:14:42 -04:00
Isaac Connor
21cf1f47a5
GroupIds is not a valid Column in Monitors
2021-03-25 17:33:04 -04:00
Isaac Connor
ec8e0f5997
replace while(1) with while(not zm_terminate) so that these scripts exit cleanly
2021-03-17 13:09:54 -04:00
Arek Kossendowski
0eab9987fc
Just updated the script with moveMap and moveRel functions.
2021-02-26 00:11:29 +00:00
Arek Kossendowski
36f11158df
Replaced the onvif control module with a modified version of Netcat.
...
The original onvif module was NOT at all ONVIF protocol implementation.
This one pretty much copies the Netcat module but with a bit of clarity
to the XML that is sent to the camera but most importantly allows
specification of full onvif URL including authentication and control URI
through the Control Address field. Parsing of the url is done through a
combination of sane defaults and the URI module.
2021-02-25 22:37:34 +00:00
Isaac Connor
0b0df96271
Merge branch 'master' of github.com:ZoneMinder/zoneminder
2021-02-18 16:05:10 -05:00
Isaac Connor
2dfb07a69b
Must set StateId as well as it cannot be Null. Default to 1
2021-02-18 10:39:39 -05:00
Jim Perkins
9a37c393cc
Update HikVision.pm
...
ERR [Can't access name:zoomStop AUTOLOAD:ZoneMinder::Control::HikVision::zoomStop member of object of class ZoneMinder::Control::HikVision from main:186]
https://forums.zoneminder.com/viewtopic.php?f=9&t=25442&p=119856#p119856
2021-02-17 19:02:01 -06:00
Isaac Connor
217d632f1a
Remove epadding, last_frame_score replaced it
2021-02-17 11:54:30 -05:00
Isaac Connor
e601c08ed0
last_read_index and last_write_index are not int32_ts. Add last_motion_score which should fix our failure to detect alarms in zmalarm etc
2021-02-16 16:56:10 -05:00
Isaac Connor
33cabd3621
Merge pull request #3156 from dodexahedron/3155-log-copies-and-moves
...
Added logging for copies/moves to zmfilter.pl
2021-02-10 17:35:06 -05:00
Brandon Thetford
a7eab75cf9
Added logging for copies/moves to zmfilter.pl
2021-02-10 15:31:10 -07:00
Peter Keresztes Schmidt
687ba03eb4
Drop relicts of zma
2021-02-10 13:26:25 +01:00
Isaac Connor
fab7efa003
Fix PrimeCapture on local cams. We need to be able to call it for each monitor
2021-02-09 20:29:37 -05:00
Peter Keresztes Schmidt
6c9983155c
Build: Reindent the CMakeLists
...
Indent with 2 spaces
Also remove expressions form closing tags. They have been made optional a while ago since they make reading rather more difficult.
2021-02-04 22:00:56 +01:00
Isaac Connor
bf8b3fee2a
Merge pull request #3126 from Carbenium/cmake-man-pages
...
Build: Make building man pages optional (enabled by default)
2021-02-04 12:05:22 -05:00
Peter Keresztes Schmidt
4db0dea1f2
Build: Make building man pages optional (enabled by default)
...
Add a new CMake option (-DBUILD_MAN) which can be used
to deactivate the man page build steps.
This is especially useful in a development situation where "make all"
is needlessly slowed down by these build steps.
2021-02-03 21:22:28 +01:00
Isaac Connor
e05fdf423b
Merge pull request #3125 from gmanic/patch-1
...
corrected $this to $self
2021-02-03 10:21:33 -05:00
Isaac Connor
e085acedc8
ALlow micro version mismatches to not be fatal. Minor and Major are still fatal.
2021-02-03 09:50:37 -05:00
Isaac Connor
8a99665311
better variable names and code documentation
2021-02-03 09:50:13 -05:00
gmanic
037f197f54
corrected $this to $self
2021-02-03 12:53:33 +01:00
Isaac Connor
a62d446f14
Add audio_frequency and audio_channels to shared mem
2021-03-01 16:49:27 -05:00
Isaac Connor
2a4723090b
Start zm_rtsp_server if ZM_MIN_RTSP_PORT is set
2021-03-01 16:47:18 -05:00
Isaac Connor
b70cd0bc76
Add zm_rtsp_server to list of daemons we can start
2021-03-01 16:47:18 -05:00
Isaac Connor
430f839954
add video_fifo filename strings to shmem.
2021-03-01 16:46:48 -05:00
Isaac Connor
671d58f0d0
bump version and put back ZM_MIN_RTSP_PORT setting
2021-01-26 12:35:17 -05:00
Isaac Connor
cb90c06cde
Merge branch 'master' into zma_to_thread
2021-01-17 17:38:34 -05:00
Isaac Connor
1e59c5bbde
Merge branch 'release-1.34'
2021-01-15 18:46:07 -05:00
Isaac Connor
7183a47a3a
split Netcat security header into multiple lines for legibility
2021-01-15 18:45:13 -05:00
Isaac Connor
f2fea95f4b
Merge branch 'master' into zma_to_thread
2021-01-14 13:02:52 -05:00
Isaac Connor
02386f0c64
SET SESSION TRANSACTION ISOLATION LEVEL READ COMMITTED for zmfilter.
2021-01-14 12:56:54 -05:00
Isaac Connor
cf2d987fc0
Add MIN_RTSP_PORT config item, but commented out for now
2021-01-11 13:46:50 -05:00
Isaac Connor
284b9f963f
Merge branch 'master' into zma_to_thread
2020-12-29 12:18:26 -05:00
Isaac Connor
c9ac5dff62
Use parent printMsg
2020-12-21 12:17:02 -05:00
Isaac Connor
e123322d06
Merge branch 'master' into rtsp_server
2020-12-15 11:00:13 -05:00
Isaac Connor
99e7ae3505
Merge branch 'master' into rtsp_server
2020-12-15 10:14:19 -05:00
Isaac Connor
bdf9a029ad
Must require ZoneMinder::Monitor if we want to use it
2020-12-15 09:35:17 -05:00
Isaac Connor
9fec11c4a9
Add missing Monitor() function.
2020-12-14 14:41:34 -05:00
Isaac Connor
47b3f319e7
Add capture_fps and analysis_fps to shared memory. This also requires support for type double
2020-12-09 12:18:43 -05:00
Isaac Connor
b0f2ff6302
Add Session cleaning
2020-12-08 10:21:55 -05:00
Isaac Connor
b261fbb397
Merge branch 'master' into zma_to_thread
2020-12-07 16:26:26 -05:00
Isaac Connor
b30b4cd66a
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:48 -05:00
Isaac Connor
5a489b3e99
Fall back to whatever Storage Areas are in the db or ZM_DIR_EVENTS if not specified in getDIskPercent and getDiskBlocks. Fixes #3081
2020-12-03 14:28:03 -05:00
Isaac Connor
6e64114ac3
Skip row locking in UpdateDiskSpace if the filter is already locking rows
2020-12-03 14:26:51 -05:00
Isaac Connor
d1c3864778
Use the ZM_FONTDIR substitution instead of hardcoding a path
2020-12-01 09:21:54 -05:00
