Merge pull request ZoneMinder#241 from ZoneMinder/alarmrefblendoption

Add alarm reference image blend percentage option and replace the text field if fast blends are enabled

db/zm_create.sql.in

@@ -352,7 +352,8 @@ CREATE TABLE `Monitors` (
  `MaxFPS` decimal(5,2) default NULL,
  `AlarmMaxFPS` decimal(5,2) default NULL,
  `FPSReportInterval` smallint(5) unsigned NOT NULL default '250',
- `RefBlendPerc` tinyint(3) unsigned NOT NULL default '10',
+ `RefBlendPerc` tinyint(3) unsigned NOT NULL default '6',
+ `AlarmRefBlendPerc` tinyint(3) unsigned NOT NULL default '3',
  `Controllable` tinyint(3) unsigned NOT NULL default '0',
  `ControlId` int(10) unsigned NOT NULL default '0',
  `ControlDevice` varchar(255) default NULL,

db/zm_update-1.26.5.sql

@@ -0,0 +1,9 @@
+--
+-- This updates a 1.26.4 database to 1.26.5
+--
+
+--
+-- Add AlarmRefBlendPerc field for controlling the reference image blend percent during alarm (see pull request #241)
+--
+ALTER TABLE `Monitors` ADD `AlarmRefBlendPerc` TINYINT(3) UNSIGNED NOT NULL DEFAULT '3' AFTER `RefBlendPerc`;
+

scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in

@@ -331,14 +331,6 @@ our @options =
  type => $types{boolean},
  category => "config",
  },
- {
- name => "ZM_BLEND_ALARMED_IMAGES",
- default => "yes",
- description => "Blend alarmed images to update the reference image",
- help => "To detect alarms ZoneMinder compares an image with a reference image which is formed from a composite of the previous images. This option determines whether images that cause events are included in this process. Doing so may increase the precision of the alarmed region but can cause problems if wholescale lighting changes cause alarms as this would not get fed back into the image and an alarm may persist indefinately. A better way to achive the same effect in most cases is to lower substantially the reference blend percentage in specific monitors.",
- type => $types{boolean},
- category => "config",
- },
  {
  name => "ZM_MAX_SUSPEND_TIME",
  default => "30",