2600b96f1b
fix merge conflict in zm_monitor.cpp
2015-08-18 14:19:46 -05:00
68adcc9e67
Merge branch 'large-timestamp' of https://github.com/schrorg/ZoneMinder into schrorg-large-timestamp
...
Conflicts:
CMakeLists.txt
configure.ac
src/zm_monitor.cpp
src/zm_monitor.h
version
2015-08-18 14:07:38 -05:00
99c8af4a17
Bring up to date with master (mostly)
2015-08-17 22:52:51 -04:00
59c1b83d4f
create embed_exif flag in Monitor class
2015-08-16 17:42:12 -05:00
7f3a07f21b
Add label size to monitor options (database and backend part)
...
This commit bumps version to 1.28.101 because of database schema change
2015-08-10 15:35:18 +02:00
a36bee3767
Merge pull request #984 from Linwood-F/507-shared-data-for-purpose-query-warning
...
Remove shared data warning for purpose query only
2015-08-04 10:09:59 -04:00
546b0dd353
Remove shared data warning for purpose query only
2015-08-03 20:37:17 -04:00
46b9bd5d1c
change the captured image size to camera image size check to be a > instead of !=. As long as we have enough buffer space, it doesn't matter if the captured image is smaller than what we defined.
2015-07-31 10:29:53 -04:00
0308baabb3
This change uses a member Image instead of constantly allocation a new Image.
...
This saves all the initialisation and the lines of debug.
Also in GetImage we potentially remove and entire copy if no scaling or timestamping is being done.
2015-06-03 15:10:52 -04:00
12516da3dc
Patched in changes to 1.28.1 to allow OmniOS/Illumos to build and work
...
haven't attempted to build yet, there are some changes
2015-05-17 17:18:54 -07:00
79398a2bec
Merge pull request #821 from onlyjob/PBP
...
beautifying *.pm
2015-05-08 08:56:01 -04:00
209f23cc6e
Fix build issues on kFreeBSD. Fixes #771
2015-04-20 12:53:02 -04:00
eddada011c
spelling corrections (thanks, /usr/bin/codespell)
2015-04-19 20:38:23 +10:00
e4e2160bf6
Don't trigger linked cameras on new events
2015-03-31 13:22:02 -04:00
550d517701
sigh... fix the image to capture_image
2015-02-22 16:36:01 -05:00
2f3104aada
fix debug line
2015-02-22 16:29:36 -05:00
3e33bc2627
This is actually from freebsd... but it's just a more informative error message
2015-02-22 15:01:32 -05:00
facda38871
add corresponding free
2015-01-13 19:52:15 -05:00
509de3ec27
need to cast malloc, get rid of perl code, only swap_path checks if we are going to use it
2015-01-13 15:16:38 -05:00
c313e2e389
Fix a memory leak in Monitor::Analyse()
2014-11-29 06:06:10 +01:00
790005c155
Include monitor name in log otput so we know which monitor we are talking about. This informaton is not included when the error occurs in zms.
2014-11-19 12:42:05 -05:00
1076a621c8
fix crashes
2014-09-08 16:56:40 -04:00
9a3b685016
fixes for vl_multi_buffer parsing when column is NULL
...
fix in debug output for local cameras causing a segfault
2014-09-08 15:20:35 -04:00
6aa1798293
fix segfault for local cameras... strangely enough, in C you should treat an integer as a pointer to string
2014-09-07 17:18:29 -04:00
83870b911d
debugging in progress but builds
2014-08-21 11:53:14 -04:00
5bc7242582
spaces vs tabs are important in rules, debian is more picky than ubuntu
...
fix placement of an if to prevent accessing unmapped mem_ptr
2014-08-19 09:11:49 -04:00
7147d47a76
Improve error messages when empty mmap file to reduce FAQ
2014-07-29 09:45:19 -04:00
585a1c50a1
Merge branch 'nommap'
2014-07-24 14:40:37 -04:00
4f694ee8cf
fix
2014-07-14 13:07:23 -04:00
99a3684fb5
change the way v4l_multi_buffer is loaded. Since t's a bool, it theoretically is 1 byte, so can't use atoi
2014-07-14 12:53:48 -04:00
9385471392
move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera
2014-07-13 16:39:27 -04:00
07dbbd46d3
only do mmap on demand
2014-06-26 14:54:47 -04:00
f62afdb8cc
add select list for rtsp method for ffmpeg and libvlc
2014-05-17 20:41:22 +02:00
ceff5a98ea
add generic Option field to ffmpeg and libvlc cameras
2014-05-05 13:29:12 +02:00
3eee90f811
Fix wrong no signal color bug introduced in zm v1.26. Thanks to forum user jcrews for spotting this
...
http://www.zoneminder.com/forums/viewtopic.php?f=30&t=21876
2014-04-23 13:27:43 +03:00
3cee6a133d
Merge remote-tracking branch 'Sune1337/motion/FrameSkip'
...
Conflicts:
db/zm_update-1.27.1.sql
web/lang/nl_nl.php
2014-04-22 20:13:11 +03:00
a8a0bf922f
Move initializer for last_motion_score to avoid compiler warning "...zones will be initialized after ... last_motion_score ... when initialized here"
2014-04-10 15:53:28 +02:00
6c637947e2
Ability to skip frames in motion detection.
...
The reason for this is to make it possible to reduce CPU-load if split-second motion detection is not required.
2014-04-10 14:59:34 +02:00
26777487dc
add feature to extend preclusive zone alarm state by x frames
2014-03-09 17:05:39 +01:00
bf708a8373
Merge branch 'master' into curl
...
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/zm_camera.h
src/zm_monitor.cpp
web/skins/classic/views/console.php
web/skins/classic/views/monitor.php
2013-12-27 14:21:12 +02:00
3321506b45
Working libvlc camera implementation.
2013-12-19 21:51:39 +00:00
c1970a51e3
Fix few errors and syntax errors regarding curl
2013-11-04 17:10:07 +02:00
8e96df7643
Initial work on adding cURL to zoneminder
2013-11-04 16:52:21 +02:00
408cac5120
Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now)
2013-11-04 09:11:33 +02:00
833705b613
Added alarm blend percent (useful for controlling how long an alarm lasts) and a dropdown list is used now if ZM_FAST_IMAGE_BLENDS is enabled
2013-11-03 10:26:04 +02:00
5a9364703c
a better fix for the sign comparison warnings during compilation
2013-09-17 10:28:59 +03:00
c3f7af7cd1
Fix sign warning during compilation
2013-09-15 04:13:09 +03:00
ee251b3c02
Removing lingering references to UsedPl
2013-08-13 12:34:59 -04:00
0ec6622a9e
Cleaning up some build errors regarding Native Motion Detection
2013-08-13 09:59:30 -04:00
1888bec092
Doing my best to manually remove nextime's plugin architecture while keeping his other changes.
2013-08-13 09:43:23 -04:00
Andrew Bauer
Linwood-F
Robin Daermann
Isaac Connor
Isaac Connor
Rick Sayre
Isaac Connor
Dmitry Smirnov
balr0g
Emmanuel Papin
m-bene
Kfir Itzhak
Sune1337
Edward Barnard
Kyle Johnson