Commit Graph

264 Commits

Author SHA1 Message Date
Isaac Connor 4f694ee8cf fix 2014-07-14 13:07:23 -04:00
Isaac Connor 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
Isaac Connor 9385471392 move v4l_multibuffer and v4l_captures_per_frame from Config to Monitor and Local Camera 2014-07-13 16:39:27 -04:00
Isaac Connor 07dbbd46d3 only do mmap on demand 2014-06-26 14:54:47 -04:00
m-bene f62afdb8cc add select list for rtsp method for ffmpeg and libvlc 2014-05-17 20:41:22 +02:00
m-bene ceff5a98ea add generic Option field to ffmpeg and libvlc cameras 2014-05-05 13:29:12 +02:00
Kfir Itzhak 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
Kfir Itzhak 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
Sune1337 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
Sune1337 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
m-bene 26777487dc add feature to extend preclusive zone alarm state by x frames 2014-03-09 17:05:39 +01:00
Kfir Itzhak 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
Edward Barnard 3321506b45 Working libvlc camera implementation. 2013-12-19 21:51:39 +00:00
Kfir Itzhak c1970a51e3 Fix few errors and syntax errors regarding curl 2013-11-04 17:10:07 +02:00
Kfir Itzhak 8e96df7643 Initial work on adding cURL to zoneminder 2013-11-04 16:52:21 +02:00
Kfir Itzhak 408cac5120 Remove the ZM_BLEND_ALARMED_IMAGES option (not needed anymore, global per monitor now) 2013-11-04 09:11:33 +02:00
Kfir Itzhak 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
mastertheknife 5a9364703c a better fix for the sign comparison warnings during compilation 2013-09-17 10:28:59 +03:00
mastertheknife c3f7af7cd1 Fix sign warning during compilation 2013-09-15 04:13:09 +03:00
Kyle Johnson ee251b3c02 Removing lingering references to UsedPl 2013-08-13 12:34:59 -04:00
Kyle Johnson 0ec6622a9e Cleaning up some build errors regarding Native Motion Detection 2013-08-13 09:59:30 -04:00
Kyle Johnson 1888bec092 Doing my best to manually remove nextime's plugin architecture while keeping his other changes. 2013-08-13 09:43:23 -04:00
Isaac Connor cdac403fb1 Merge ../zum into develop
Conflicts:
	AUTHORS
	configure.ac
	db/zm_create.sql.in
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
	scripts/zmupdate.pl.in
	src/Makefile.am
	src/zm_buffer.cpp
	src/zm_config_defines.h
	src/zm_event.cpp
	src/zm_ffmpeg.h
	src/zm_ffmpeg_camera.cpp
	src/zm_image.cpp
	src/zm_jpeg.h
	src/zm_local_camera.cpp
	src/zm_logger.cpp
	src/zm_mem_utils.h
	src/zm_monitor.cpp
	src/zm_monitor.h
	src/zm_mpeg.cpp
	src/zm_remote_camera_http.cpp
	src/zm_remote_camera_rtsp.cpp
	src/zm_rtsp.cpp
	src/zm_sdp.cpp
	src/zm_sdp.h
	src/zm_stream.cpp
	src/zm_thread.cpp
	src/zm_thread.h
	src/zm_threaddata.cpp
	src/zm_user.cpp
	src/zm_user.h
	src/zm_utils.cpp
	src/zm_zone.cpp
	src/zm_zone.h
	web/includes/actions.php
	web/lang/big5_big5.php
	web/lang/cn_zh.php
	web/lang/cs_cz.php
	web/lang/de_de.php
	web/lang/dk_dk.php
	web/lang/en_gb.php
	web/lang/es_ar.php
	web/lang/et_ee.php
	web/lang/fr_fr.php
	web/lang/he_il.php
	web/lang/hu_hu.php
	web/lang/it_it.php
	web/lang/ja_jp.php
	web/lang/nl_nl.php
	web/lang/pl_pl.php
	web/lang/pt_br.php
	web/lang/ro_ro.php
	web/lang/ru_ru.php
	web/lang/se_se.php
	web/skins/classic/js/skin.js
	web/skins/classic/views/js/monitor.js.php
	web/skins/classic/views/monitor.php
	web/skins/classic/views/zone.php
2013-07-25 11:49:55 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01:00
Kfir Itzhak 0fe55a18bf Something useable :)
1) Added optimized versions of four field deinterlacing, including SSSE3 ones.
2) Removed the "Very Soft" and "Very Hard" options.
3) Deinterlacing happens before any rotation to the image.
2012-07-15 17:30:37 +03:00
Kfir Itzhak a6c7acd02a Some more progress on the deinterlacing code. 2012-07-13 20:11:16 +03:00
Kfir Itzhak f27b424503 Much more progress!
1) Removed the V4L2_CAPTURE_FIELDS option.
2) V4L2 Interlacing control options added to the new per-monitor deinterlacing option.
3) Fixed the 32bit version of Linear.
4) Added Blend (50%) and Blend (25%).
5) Completed the grayscale version of the Four Field Motion Adaptive deinterlacing algorithm.
2012-07-13 20:11:16 +03:00
Kfir Itzhak 8f0ec42ba2 First work on adding built-in deinterlacing to ZM. 2012-07-13 20:11:16 +03:00
Kfir Itzhak 0932f50d80 1) Added the image size and format to the shared memory. This is useful for viewer applications relying on the shared memory.
2) Small changes to improve the response time of the DVR controls. Going through frames in a paused event is now much faster.
2012-03-22 08:30:57 +02:00
Kfir Itzhak 115db01f8c Few changes:
1) Fixed buffer overflow occurring if JPEG quality is set to 100.
2) Changed linked monitors alarm behaviour again.
3) Fixed extremely poor blend performance on some processors such as the Intel Atom.
4) Added optional profiling code for Blend() and Delta().
2012-02-09 12:23:45 +02:00
Kfir Itzhak 1f072b1a62 Fixed few zma issues related to signal checking and linked monitors. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 2135e58c41 Fixed zma crashes caused by flaky signal and few bugs in mocord mode. 2012-02-01 07:33:21 +02:00
Kfir Itzhak 46aa1bb1d8 Fixed bug in linked monitor loading code which should fix the crash of a monitor linked to a disabled monitor. 2012-02-01 07:33:20 +02:00
Kfir Itzhak 442b9e5ba2 1) Reloaded zm_event.cpp to hopefully fix its issues once and for all.
2) Added backup code in case sendfile() fails.
3) Fixed a bug that allowed to link a monitor to itself, which can cause alarm lasting forever once triggered.
2012-02-01 07:33:20 +02:00
Kfir Itzhak de2df49d64 1) Added support for the new formats to the mpeg code.
2) Fixed unwanted extra call to set video format for local cameras.
3) Small changes to the perl shared memory types.
2012-02-01 07:33:20 +02:00
Kfir Itzhak eab09844de 1) Some more work on the overlay function.
2) Got rid of some compiler warning messages.
2012-02-01 07:33:20 +02:00
Kfir Itzhak eeaed7ccd3 Some small changes
1) Fixed wrong size calculation in Image::AssignDirect.
2) Improved libjpeg subpixel order selection.
3) Finished adding support in the simple Overlay function.
4) Completed Flip and Rotate 32bit RGB support.
5) Allow ZM to compile on 32bit with omit frame pointer disabled by defining _DEBUG
   To use one less register in the SSE algorithms.
6) Removed the counter variable in some loops to reduce loop overhead.
7) Modified crop query error handling.
8) Most of the shared data now declared as volatile.
9) Small improvements to the AlarmedPixels motion detection.
10) Changed the default blend percent from 7% to 12%.
11) Fixed an earlier bug created by me: motion detection checking the wrong pixels.
2012-02-01 07:33:20 +02:00
Kfir Itzhak 1afe0bbf42 1) Added back the colour SSE2 delta algorithms
2) Modified SSE algorithms to use one less register
3) Fixed AlarmedPixels motion detection
2012-02-01 07:33:20 +02:00
Kfir Itzhak 642a1bfdb2 1) RTSP support for direct capture and target colorspace.
2) Hopefully fixed the mmap unexpected shared memory size completely this time.
3) Added 32bit RGB and grayscale support to the signal checking.
4) Fixed zms\nph-zms keeps running after changing capture options, eating CPU and has to be killed with -9.
5) Default monitor options changed again.
6) Fixed unrelated bug: Undefined constant ZM_V4L2 in monitor probe.
7) Fixed unrelated bug: Error in offset X in monitor probe.
8) Changed monitor probe's prefered capture settings.
9) Small other minor changes.
2012-02-01 07:33:20 +02:00
Kfir Itzhak b0bc227232 1) Made shared memory 16 byte aligned and identical size and layout for all platforms.
2) Fixed a bug in zmwatch.pl: Not freeing shared memory handles between iterations.
3) Modified default monitor options to simplify new monitor creation.
2012-02-01 07:33:20 +02:00
Kfir Itzhak ea3a1a9072 1) Removed the mmap file removal at shutdown.
2) ZoneMinder should now compile cleanly wihout swscale
3) Fixed multiple monitors capturing from the same device and channel.
Current code allows for multiple monitors sharing the same device, each on a different channel
Or, multiple monitors sharing the same device, all on the same channel.
In both cases, capture method, width, height and palette must be identical on all monitors.
However, target colorspace can be different because each monitor handles the format conversion separately.
2012-02-01 07:33:20 +02:00
Kfir Itzhak 33119c6dc5 1) Added image size requirements to ensure proper alignment
2) Changed image class buffer related functions
3) Improved format selection for local cameras
4) Removed imagesize check for swscale
5) Fixed mmap unexpected memory size when changing capture options
6) Fixed unrelated bug in zmdc.pl: sockets directory doesn't exist
2012-02-01 07:33:20 +02:00
Kfir Itzhak 4a59761bcc Getting closer and closer everyday.
1) Fixed many errors to get it to compile
2) Fixed some small bugs
3) Small other changes
2012-02-01 07:33:20 +02:00
Kfir Itzhak 5c418133bf Lots accomplished!
1) Delta and blend SSE and standard alogirthms inside
2) Changed event streaming to use sendfile() syscall if available
3) Direct memory capture (Less memcpys required)
4) Added macros for BGR24 and RGB32(and its variants) formats
5) Modified Monitors database table to add a target colorspace option
6) Changed most image buffer allocations to be on 16 byte boundary, work still in progress
7) Added Target colorspace instead of the old colours selection. this one also visible to local cameras
8) Replacing Y deltas option with ZM_CPU_EXTENSIONS
9) Added SSE detection code
10) Changed some code to make linking success with inlining enabled.
11) Some other changes and work still in progress for some listed above
2012-02-01 07:33:20 +02:00
stan 0ff4e53832 Allow FPS reporting to be disabled by setting valure to zero
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3308 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-03-02 12:23:10 +00:00
stan 8048c1c355 Updated to allow the versions of video4linux to existed independently of each other. Ubuntu 11.04 oalyn has V4L2.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3302 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-15 21:59:06 +00:00
stan 162b1b2feb Fixed bug in signal checking - http://www.zoneminder.com/forums/viewtopic.php?t=17158
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3287 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-02-06 16:34:26 +00:00
stan aa4a97d0da Fixed incorrect monitor type when loading individual ffmpeg monitors. Not used anywhere currently so no impact.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3225 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:18:46 +00:00
stan 061a324a36 Fixed issue with image scaling etc when streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3213 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-12-13 22:30:22 +00:00
stan 46d777398e Updated to use fixed buffer sizes rather than relying on o/s defined.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3189 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 12:22:35 +00:00
stan 2effcc506b Reworked to handle signal lost events better and to prevent untimed events.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3172 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 16:43:33 +00:00
stan 52b83eb813 Fixed issue with signal loss detection and timestamp label.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3143 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-10-08 22:42:54 +00:00
stan cd16c91ccd Tweaked zone image dumping.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3066 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-05-27 12:18:43 +00:00
stan 60f0136ed3 Merged in image root changes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3040 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:16:40 +00:00
stan f0e7aaf6db Made mapped memory files not hidden
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2999 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-12-02 18:37:24 +00:00
stan 30c3c88c55 Remove MS_INVALIDATE from closing msync as not required.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2991 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-11-24 11:31:00 +00:00
stan 10b01a5062 Added Panic level for debug with stack dump.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2975 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 10:01:46 +00:00
stan 174c82a452 Remove error message if terminated and can't send.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2916 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-06-09 14:15:02 +00:00
stan 3c10237833 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2905 e3e1d417-86f3-4887-817a-d78f3d33393f 2009-05-28 08:47:59 +00:00
stan 820dce5e42 Updated for decimal frame rates.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2867 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 13:47:19 +00:00
stan ca858a8562 Applied patch from 'mitch' to improve error detection when streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2864 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-08 09:47:37 +00:00
stan 4c8352153d Removed srand call and improved error message.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2849 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-14 20:19:36 +00:00
stan 72f908c4e7 Changed streaming to dynamically reduce frame rates if streams are sent too slowly. Made low bandwidth montage more resilient.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2844 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-03 12:10:54 +00:00
stan fa5db09a73 FIxed issues with negative FPS affecting streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2839 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-04-01 19:39:23 +00:00
stan 73ad3a7097 Changed types/order of stream status structs to work on 64 bit systems.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2797 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-08 14:34:09 +00:00
stan ee972ac78a Fixed issue with event section lengths being ignored on alarm and rationalised debug.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2778 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-18 22:05:32 +00:00
stan e64312e48c Corrected so mapped memory files are removed by package script.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2771 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:32:03 +00:00
stan 9c518efb3d Stopped memory file getting deleted unless zmc restarts. Better overrun detection.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2770 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 12:29:51 +00:00
stan 98b648bfc1 Fixes to multiple cameras on one device.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2756 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:33:05 +00:00
stan d92c781026 Removed mapped memory file on shutdown.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2755 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-12 21:32:00 +00:00
stan c753214450 Added some conditional compilation around ffmpeg stuff.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2733 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 15:02:33 +00:00
stan dde584a12a Restructured camera capture methods somewhat and revamped V4L stuff a bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2724 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 09:48:06 +00:00
stan bb872feab4 Added result error checking to frame streaming.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2718 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:37:39 +00:00
stan 23d82a7e03 Added FFMPEG camera type
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2716 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-20 15:01:32 +00:00
viseon f2ad7cc770 Add offset to replay_rate to make it unsigned
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2708 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:56:15 +00:00
stan c83d340ad8 COntrol stream replay rate now two bytes long
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2703 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 23:14:20 +00:00
stan 842398a32f Added checks to return status of some functions.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2690 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-12-05 18:13:26 +00:00
stan 6d78b17d90 Added CMD_VARPLAY to stream commands
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2687 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-11-03 13:16:47 +00:00
stan e60149ce36 Modification to streaming to avoid making stream buffer if not required. Also cycle fix.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2679 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-29 23:08:21 +00:00
stan 94912ddae1 Ensure that all events has at least some regular frames to start with.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2674 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-28 12:52:09 +00:00
stan 3aedc486b7 Updated for latest ffmpeg
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2667 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-16 16:11:49 +00:00
stan 0606700091 Updated to continuously update Notes
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2645 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-10-05 19:07:43 +00:00
stan 506815599b Addressed issues with event start and end times. Now includes the time from first to last frame.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2631 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:45:59 +00:00
stan c207e7720f Changed force close events to more general setting allowing long events to be closed after alarm.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2630 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-25 11:18:55 +00:00
stan a79594387c Fixed various mapped memory errors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2624 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-01 15:31:20 +00:00
stan e6041e24a7 Uppdated copyright headers
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2611 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-25 09:33:23 +00:00
stan 03611d70c9 Fixed printf issues with stream cmd_type size change
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2595 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-23 09:56:38 +00:00
stan d598f54210 Merged in V4L2 initial changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2582 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:20:52 +00:00
stan aa26ab7b18 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2532 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:35:59 +00:00
stan b2f616ff21 Merged in mmap changes. Revision 2323:2515
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2516 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 15:21:16 +00:00
stan ee44d4b274 Updated debug format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2513 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:43:47 +00:00
stan 2824cb7355 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2508 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-14 13:54:50 +00:00
stan 799ee78675 Bug 471 - Compiler warnings, sorted out types and general format tidying
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2357 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-13 13:36:12 +00:00
stan 6a3c6dfa14 Bug 445 - Fixed problem with using the wrong count when reloading linked monitors.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2294 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:14:32 +00:00
stan 9d291c0ba1 Bug 431 - Removed default args for monitor constructors and now can stream events without active monitor.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2274 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:50:53 +00:00
stan 911920dc71 Fixed issue with single frame streaming not working.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2234 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-11 15:57:54 +00:00
stan fdbb18c3f8 Fixed force/disable alarm buttons.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2232 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-04 17:36:30 +00:00
stan 5378a73ae2 Corrected timestamp fractional token.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2221 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 15:07:19 +00:00
stan 6932898d40 Bug 390 - Changed timestamp tokens.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2194 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 16:31:42 +00:00
stan 8d905aac99 Bug 400 - Made signal check colour monitor specific.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2193 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-05 15:05:28 +00:00