Commit Graph

1061 Commits

Author SHA1 Message Date
root
200dda11a2 Merge branch 'continuous' into cont_mast 2021-04-16 10:07:10 -04:00
Isaac Connor
c9c4224dd2 Change url used for authentication to magicBox.cgi?action=getDeviceType 2021-04-14 17:19:07 -04:00
Isaac Connor
7489c3850d Store last command for continuous moves so that moveStop can send the correct stop command 2021-04-14 17:19:01 -04:00
Isaac Connor
4ead6886a3 Make shm debug level 3 2021-04-10 15:40:37 -04:00
Isaac Connor
da630f7534 Move shm Memory debug statements to level 2. 2021-04-10 15:35:24 -04:00
Isaac Connor
60970673c7 Implement debug levels in perl side. DEBUG==DEBUG1. 2021-04-10 15:35:04 -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
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
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
gmanic
037f197f54 corrected $this to $self 2021-02-03 12:53:33 +01:00
Isaac Connor
e6358290b4 this=>self 2021-02-02 17:30:42 -05:00
Isaac Connor
a62d446f14 Add audio_frequency and audio_channels to shared mem 2021-03-01 16:49:27 -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
cf2d987fc0 Add MIN_RTSP_PORT config item, but commented out for now 2021-01-11 13:46:50 -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
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
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
d1c3864778 Use the ZM_FONTDIR substitution instead of hardcoding a path 2020-12-01 09:21:54 -05:00
Isaac Connor
836cd2d58d Merge branch 'Font' of https://github.com/hax0kartik/zoneminder into font 2020-11-30 09:45:39 -05:00
hax0kartik
b212b0e450 Allow modifying font file location 2020-11-28 20:18:17 +05:30
Andrew Bauer
ff4b0e6309 add option to disable thumb animation 2020-11-25 13:03:16 -06:00
Isaac Connor
98c2c6cccf Add Status,CaptureFPS,AnalysisFPS, CaptureBandWidth to MonitorStatus fields 2020-11-21 15:09:43 -05:00
Isaac Connor
30363c1d4b Add Monitor Status loading 2020-11-21 15:08:29 -05:00
Isaac Connor
5bf5d58ac1 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:32:50 -05:00
Isaac Connor
a47b72af49 Fixes recovering frames from jpegs. Use Time::HiRes stat to get microseconds. 2020-11-16 11:31:36 -05:00
Isaac Connor
f1b8266e26 Only join storage and Monitors if necessary 2020-11-13 17:03:51 -05:00
Isaac Connor
159b383276 Move event stat totals to Monitor_Status. Implement a class for them called Monitor_Status 2020-11-06 13:27:47 -05:00
Isaac Connor
adbd3486bf Rename StartTime, EndTime in Events to StartDateTime and EndDateTime 2020-11-04 13:49:39 -05:00
Isaac Connor
5fadd366e7 Always setup Logging SIG handlers. Implement SIGUSR1 and SIGUSR2 handling to match c++ side behaviour. Fixes #3057 2020-10-30 11:50:03 -04:00
Isaac Connor
65df84ef7e Make ZoneMinder::Event::delete aware of transactions 2020-10-30 11:49:00 -04:00
Isaac Connor
7a65a64644 add LockRows to Filters 2020-10-26 18:47:40 -04:00
Isaac Connor
90e81c5774 Merge branch 'release-1.34' 2020-10-23 09:34:35 -04:00
Isaac Connor
a0f733615c allow empty string as a default value 2020-10-22 11:26:34 -04:00
Isaac Connor
40c57b4b23 Improve logic in set, improve logging 2020-10-22 10:43:53 -04:00
Isaac Connor
6c546f36ae allow dashes and underscores in log file name 2020-10-22 10:43:35 -04:00