Commit Graph

190 Commits

Author SHA1 Message Date
stan 7b43ac2645 Use JSON encoding for language independent serialisation (filters and control commands) rather than PHP serialisation. Removes dependency on rare PHP::Serialization perl module.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3357 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-05-23 16:18:18 +00:00
stan cffcd39802 Added ffmpeg monitor presets
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3227 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-17 18:21:27 +00:00
stan 46358c84e9 Changed configure/build procedure to allow specified run, tmp and log dirs and avoid early replacement of configure variables in SQL defautl config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3222 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-01-07 11:10:18 +00:00
stagecoach a6cded083d Updated zm_create.sql.in:
Path field in Monitors table was 64, should be 255 like in MonitorPresets table. Modified length of Path field in Monitors table from 64 to 255.
SubPath field in Monitors table was 255, should be 64, like in MonitorPresets table. Modified length of SubPath field in Monitors table from 255 to 64.

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3204 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-24 00:17:11 +00:00
jaidhar 069136fe53 Added vlog function to view log output, ability to redirect XML logging to it's own file
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3201 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:09:18 +00:00
jaidhar c7b3d04eed Got rid of MJPEG code choice for viewing events, only MPEG-4 and H264 now. Added default bitrate for event viewing to config XML
Signed-off-by: Jai Dhar <jdhar@eyezm.com>

git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3199 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-18 19:08:33 +00:00
jaidhar e57c1b0331 XML Plugin: More config options added, stability fixes to H264 streaming
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3192 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 23:04:09 +00:00
jaidhar 78caa0adb0 XML Plugin: Added more XML Options along with H264 options. These will be disabled unless client ver >=1.2. Added ability to track client version in PHP
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3191 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-12 04:26:31 +00:00
jaidhar 2d7979ac93 XML Plugin: Moved key XML Plugin options to database and updated ConfigAdmin/options.php to show XML Tab (new category 'XML' created). More H264 streaming updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3186 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-11 05:25:43 +00:00
stan 825eda95a6 Regenerated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3162 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-11-03 15:56:23 +00:00
stan d22356d495 Versions updated
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3039 e3e1d417-86f3-4887-817a-d78f3d33393f
2010-02-28 19:15:35 +00:00
stan e91148585a Default check colour for signal loss was wrong, now corrected.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2973 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-10-14 09:41:39 +00:00
stan 0a6c56cd2f Added reload combozola config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2891 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-05-25 18:07:51 +00:00
stan 6efad7b23c Moved BTTV presets to end of list
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2832 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:11:45 +00:00
stan ddafd7bc7d Updated with new Local presets
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2831 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-31 13:10:28 +00:00
stan 3310ea3ae9 Added V4L version to presets and generic PAL/NTSC standards
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2823 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-03-30 12:00:14 +00:00
stan 61089eeeb1 Added authentication hashed logins.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2781 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-19 14:06:39 +00:00
stan 3a86651627 Reworked multi-buffering etc for V4L multi-sources.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2775 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-02-17 21:23:27 +00:00
stan 25dc98a39f Added ability to specify MySQL DB engine type.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2725 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-28 11:23:50 +00:00
stan 21d8d74a28 V4L2 updates
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2723 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-27 11:07:24 +00:00
stan 69662d644a Fixed missing DB table changes.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2722 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-23 15:35:41 +00:00
stan e39b2fd16e Adeed ffmpeg monitor type.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2719 e3e1d417-86f3-4887-817a-d78f3d33393f
2009-01-21 17:42:21 +00:00
stan 14e037d6fb Fixed broken local camera presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2643 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-30 15:39:54 +00:00
stan 435c469d4b Added DUMP_CORES option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2639 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-29 11:43:43 +00:00
stan 7e26b15eb5 Updated for event close mode mods.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2633 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-09-26 09:48:03 +00:00
stan 6fcab609c1 Fixed issue with MonitorPreset column mismatch
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2598 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-24 15:36:35 +00:00
stan c4c376a656 Updated for new colour values for non-Local monitor.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2584 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-21 15:23:01 +00:00
stan b83c3a46d2 git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2530 e3e1d417-86f3-4887-817a-d78f3d33393f 2008-07-16 08:29:34 +00:00
stan 55fb3418ac Updated with config
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2524 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-15 09:05:40 +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 d7818cd913 Remove learn state bit.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2511 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-07-14 14:42:51 +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 72c8bd107c But 468 - Fixed format of PurgeWhenFull filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2340 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-03-10 09:33:51 +00:00
stan c411eaf614 Bug 466 - Change old format PwF filters.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2320 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 19:03:39 +00:00
stan 5c3cefa09f Bug 466 - PurgeWhenFull filter now in correct format
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2319 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-24 18:58:15 +00:00
stan 0c8b6320bc Updated config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2311 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:47:25 +00:00
stan 630f74b5ce Bug 454 - Ensure that the correct version is stored in the DB so upgrades can be automatic.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2308 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-13 23:01:07 +00:00
stan 86aaa5450e Bug 452, 453 - Added support for Veo Observer and Blue Net Video Server in presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2295 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-02-10 22:16:48 +00:00
stan 9ba8110799 Set delete flag on PurgeWhenFull filter.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2285 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-01-13 18:17:32 +00:00
stan 9e13cae829 Bug 438 - Fixed various PTZ protocol and control issues.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2281 e3e1d417-86f3-4887-817a-d78f3d33393f
2008-01-08 12:33:11 +00:00
stan f0eb05362e Bug 427 - Updated with aspect ratio config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2272 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-29 18:48:39 +00:00
stan bdeeb7f2e4 Fixed missing comma in schema
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2268 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-28 12:46:41 +00:00
stan 634c6ed88e Removed trailing commas on primary keys
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2267 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-24 12:40:24 +00:00
stan 412d28690e Bug 417 - Removed Frames id index, not used.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2254 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-09 16:27:34 +00:00
stan 3c842cf7df Bug 417 - Optimised Events indicies
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2252 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-09 13:44:47 +00:00
stan 0a1291a762 Removed redundant indices.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2250 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-12-08 18:37:58 +00:00
stan e291095f0e Corrected default label format.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2242 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-11-18 13:06:32 +00:00
stan 102ec8b439 Fixed missing backquote.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2224 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-20 09:32:34 +00:00
stan 4198f02114 Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2220 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 14:40:44 +00:00
stan 215184e4cb Bug 345 - Added alarm jpeg file quality setting.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2209 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-18 10:58:03 +00:00
stan 3427dfddd2 Bug 42 - Users can now change their own passwords.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2204 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-17 15:49:08 +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
stan 07a9f1fa1c Bug 228 - Added deep storage option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2190 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-09-04 16:08:55 +00:00
stan bd558af08f Bug 414 - Changed PTZ control functions to use libraries and sockets
rather than scripts.


git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2180 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-30 10:43:06 +00:00
stan 50cc4d980f Bug 411 - Merged in DVR functionality.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2175 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-08-29 18:11:09 +00:00
stan 2c09dbeeb9 Bug 410 - Added in detection suspension if motion overloaded.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2132 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-06-05 14:12:14 +00:00
stan 91fbdb8329 Increased size of Definition column in run states.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2098 e3e1d417-86f3-4887-817a-d78f3d33393f
2007-04-03 09:59:01 +00:00
stan e180ded0e2 Fixed up inconsistencies in db.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2078 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-17 11:40:26 +00:00
stan 6572552b94 Updated with 1.22.3 db structure.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2073 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 19:16:19 +00:00
stan c2468b7e69 Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2066 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 13:29:11 +00:00
stan 69951fd67d Adeed longer Notes, and LabelFormat fields.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2064 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-11-16 11:37:46 +00:00
stan 501ded0f5d Updated for 1.22.3
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@2025 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-10-23 14:06:21 +00:00
stan c4857d8dbf Updated for 1.22.2
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1996 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-25 14:51:29 +00:00
stan c29b436e54 Removed redundant zone extent columns
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1961 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-05-08 12:34:44 +00:00
stan 1e6aaf6a2e Updated default config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1944 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-24 13:37:41 +00:00
stan d5014b0bd7 Bug 257 - Added monitor presets for GadSpot cameras
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1925 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-11 10:09:27 +00:00
stan 2ccff26572 Updated config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1924 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-04-07 13:57:04 +00:00
stan 131ed30d7a Bug 260 - Added average pixel difference to statistics
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1910 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 15:34:16 +00:00
stan 857d246521 Bug 289 - Added B&W monitor presets
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1907 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 13:51:04 +00:00
stan 8ddb996c14 Bug 301 - Alarm Maximum FPS now monitor specific.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1904 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-31 12:49:34 +00:00
stan cb1b09e257 Made MaxFPS default to NULL rather than 0.0
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1882 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-03-23 18:13:47 +00:00
stan d6ce8c8f5b Updated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1878 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-08 16:25:44 +00:00
stan d2b29cc4de Freshened.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1876 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-02-08 12:28:40 +00:00
stan ff60da760e Bug 5 - Linked monitors
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1860 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-23 16:42:41 +00:00
stan f33d5580b4 Bug 261 - Reduced sensitivity of zone presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1844 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-20 15:16:49 +00:00
stan 006f50211f Modified default.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1837 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 17:11:15 +00:00
stan 096072b3dc Bug 230 - Rationalised thumbnails and put them in temporary cache dir.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1836 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-17 17:07:13 +00:00
stan c9d3769c6c Regenerated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1811 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 20:50:06 +00:00
stan 8954d18073 Added MonitoId index to Zones and regenerated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1796 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-14 13:32:45 +00:00
stan 8b7a70662c Regenerated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1785 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 15:31:34 +00:00
stan fa33d7222c Regenerated.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1783 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 00:45:48 +00:00
stan 41bff64375 Fixed comments and added new control script for NCS-370
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1778 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-12 00:02:44 +00:00
stan 18e007c9e7 Fixed Coords field name.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1759 e3e1d417-86f3-4887-817a-d78f3d33393f
2006-01-02 23:58:12 +00:00
stan 10c3718bcc Made donate reminder time dynamically settable.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1751 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 19:13:41 +00:00
stan fbb00456af Bug 222,240 - Added zone and monitor presets.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1750 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-31 18:08:50 +00:00
stan f0e6241aeb Updated with new config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1727 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 22:50:20 +00:00
stan b3e75d77ee Bug 238 - Changed RunMode to Enabled flag
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1719 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-22 15:01:03 +00:00
stan 85ad4b2bbd Fixed schema errors and updated config.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1707 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-21 00:10:58 +00:00
stan 8b30f67bcd Bug 236 - Revamped database configuration and updates.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@1705 e3e1d417-86f3-4887-817a-d78f3d33393f
2005-12-20 23:00:58 +00:00