Commit Graph

181 Commits

Author SHA1 Message Date
Andrew Bauer 56fd08d6e9 Change TMPDIR default to /var/tmp, Add ZM_SOCKDIR 2014-10-05 09:42:47 -05:00
Andrew Bauer 60ed8d7366 Update ConfigData.pm.in
Changing the help text for DIR_EVENTS, DIR_IMAGES, and DIR_SOUNDS to make it more obvious that one should not specify a folder outside the web root and that one should probably not ever change these values from their default.
2014-09-12 08:05:15 -05:00
Isaac Connor 980a7a83bf Add some text referencing the settings on the monitor settings page 2014-08-21 10:04:08 -04:00
Isaac Connor 7cbb079370 revert size check for now 2014-08-04 11:26:33 -04:00
Isaac Connor a87f75eee0 any size discrepancy is caused for bailing 2014-08-01 11:27:51 -04:00
Florian Asche fa67e21c07 Update FI9821W_Y2k.pm
Fixed this issue:
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 138.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 141.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 144.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 154.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 156.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 195.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 222.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 247.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 275.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 302.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 329.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 356.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 383.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 399.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 414.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 448.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 671.
"my" variable $cmd masks earlier declaration in same scope at FI9821W_Y2k.pm line 690.
2014-07-22 19:06:04 +02:00
Andrew Bauer fbf4de5eb2 Update Wanscam.pm
No longer needed for zm 1.27
2014-03-19 11:56:08 -05:00
Andrew Bauer faacea50ef Update Wanscam.pm
Use full package name when using ZM_VERSION
2014-03-19 11:52:58 -05:00
Isaac Connor 626c7bd6b7 pull this from the Wiki 2014-03-19 11:57:42 -04:00
Andrew Bauer 15f014eb8b Changes from nagyrobi:
Todays computer hardware and internet speeds allow for a much more responsive user interface to be ran. I suggest to optimize these values in the "High bandwidth" profile for today's technology. These values were established at least 8 years ago... There's no risk for the user because on a fresh install and new logins, new browsers "Low bandwidth" is always the default. Optimizing these values produce no noticeable load increase on modern hardware, and a snapy, pleasant user interface if desired.

Also increased event image digits because I often run into situations where very long events run out of file naming digits (max 999 files is too short, that's only 40 seconds).
2014-02-26 09:00:10 -06:00
tim 05e395613b Adding PTZ module for Toshiba IK-WB11A 2014-01-14 00:58:12 -08:00
Isaac Connor d185f05006 robustness/code style changes 2014-01-03 12:55:30 -05:00
Dmitry Katsubo 20dd76b354 Using the full path for ZM_VERSION. Using "Control Device" value for user/password. 2014-01-01 13:16:53 +01:00
Dmitry Katsubo 3fb76eaf35 Initial version of control file for Foscam IP cameras.
Taken from http://www.zoneminder.com/wiki/index.php/Foscam
2013-12-29 22:24:35 +01:00
Andrew Bauer b5e4e1e573 Update FI8608W_Y2k.pm
Fix typo
2013-12-21 11:32:47 -06:00
Kyle Johnson 2cadb3c5a6 Fixed a small typo in ConfigData.pm.in 2013-12-21 10:55:36 -05:00
Isaac Connor 9e7d729ca8 use the full path for ZM_VERSION 2013-12-17 12:06:14 -05:00
Isaac Connor 2ced76c20d do this one too 2013-12-17 11:24:33 -05:00
Isaac Connor 1d338ed879 more 2013-12-16 16:36:12 -05:00
Isaac Connor 48a6dcf5ce Change COnfig from using the subroutine symbol table to just using a global hash 2013-12-16 16:32:02 -05:00
Kyle Johnson f39f2fab66 Merge pull request #241 from ZoneMinder/alarmrefblendoption
Add alarm reference image blend percentage option and replace the text field if fast blends are enabled
2013-12-13 10:13:34 -08:00
Patrick McGuire 8c0ad352f5 Fix shared memory errors on centos 6.4 2013-11-08 14:53:01 -05:00
Isaac Connor f4dfd88d9f handle bad config lines better 2013-11-06 17:02:01 -05:00
Isaac Connor 7a2f3b5226 add in missing @ 2013-11-04 09:57:00 -05: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
Isaac Connor d428c832e7 blah 2013-11-01 09:50:50 -04:00
Kfir Itzhak ba727a5611 Changed default HTTP version to 1.0 instead of 1.1, as we don't fully support important HTTP/1.1 features such as chunked encoding 2013-10-07 16:57:26 +03:00
Kfir Itzhak 1609fd688b Changed default option of ZM_COLOUR_JPEG_FILES to no. It impacts performance and is not needed anymore, all modern image viewers support grayscale JPEG images 2013-10-07 16:54:13 +03:00
Isaac Connor 60258e7aa1 Check the size of the mmap file before mmaping it. If the mmap file 0 ( can happen with remote cameras that can't be reached because it is offline ) we get sigbus. I think the mmap succeeds, but is zero sized, so the first access causes SIGBUS. 2013-10-04 11:54:21 -04:00
Isaac Connor ab1314f250 clean out autogenerated files 2013-09-12 14:43:57 -04:00
Kyle Johnson 4cc878e930 Merge branch 'release-1.26' into develop
Conflicts:
	scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm
2013-09-05 11:40:38 -04:00
Knniggett 8608250b06 This adds PTZ control files and camera presets for specific ptz cameras. 2013-08-22 13:20:38 -05:00
Isaac Connor c014f3faaa delete generated files 2013-08-13 10:06:37 -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
Isaac Connor 9d89fb3bcb Merge branch 'kfir-proper' into develop 2013-05-10 12:23:58 -04:00
Isaac Connor d458c145a3 Add Brian Rudy's script to control SkyIPCam cameras. 2013-04-29 12:04:12 -04:00
nextime 33cbd89212 Migrate svn to git 2013-03-17 00:45:21 +01: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 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 60a042e44b Fixed an error in zmMemWrite(), breaking shared memory writes from perl, which prevented zmtrigger.pl (and perhaps others) from working. 2012-03-12 19:52:53 +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 8ac3dda54b 1) Removal of the ZM_LOCAL_BGR_INVERT option.
2) Allow FPS reporting interval to be zero again.
3) Added translation for the new texts.
4) Corrected the blend function declaration.
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 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
stan 13e46d8595 Improved makePath and tweaks to createEvent
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3522 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-11 10:08:49 +00:00
stan dacb1f2a27 Added event creation functions for scripted events, not entirely complete.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3521 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-11-10 22:56:21 +00:00
stan 1e80d72ddd Fixed line endings.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3507 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-26 09:10:22 +00:00
stan b64c506659 Added SFTP upload option.
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3500 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 14:10:20 +00:00
stan a3ba83aca4 Typo
git-svn-id: http://svn.zoneminder.com/svn/zm/trunk@3498 e3e1d417-86f3-4887-817a-d78f3d33393f
2011-08-23 08:46:59 +00:00