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

src/zm_monitor.cpp

@@ -1049,7 +1049,7 @@ bool Monitor::Analyse()
     struct timeval now;
     gettimeofday( &now, NULL );
 
-    if ( image_count && !(image_count%fps_report_interval) )
+    if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
     {
         fps = double(fps_report_interval)/(now.tv_sec-last_fps_time);
         Info( "%s: %d - Processing at %.2f fps", name, image_count, fps );
@@ -2589,7 +2589,7 @@ int Monitor::Capture()
 
         image_count++;
 
-        if ( image_count && !(image_count%fps_report_interval) )
+        if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
         {
             time_t now = image_buffer[index].timestamp->tv_sec;
             fps = double(fps_report_interval)/(now-last_fps_time);

web/lang/big5_big5.php

@@ -131,7 +131,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/cn_zh.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'        => '报警最大帧率必须是正整数或正浮点数',
     'BadChannel'            => '通道必须设为大于零的整数',
     'BadDevice'             => '必须为器件设置有效值',
-    'BadFPSReportInterval'  => 'FPS帧数报告间隔缓冲数必须是100以上整数',
+    'BadFPSReportInterval'  => 'FPS帧数报告间隔缓冲数必须是0以上整数',
     'BadFormat'             => '格式必须设为大于零的整数',
     'BadFrameSkip'          => '跳帧数必须设为大于零的整数',
     'BadHeight'             => '高度必须设为有效值',

web/lang/cs_cz.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/de_de.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm-Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
     'BadChannel'           => 'Der Kanal muss ganzzahlig 0 oder größer sein',
     'BadDevice'            => 'Das Gerät muss eine gültige Systemresource sein',
-    'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Zähler muss ganzzahlig 100 oder größer sein',
+    'BadFPSReportInterval' => 'Der FPS-Intervall-Puffer-Zähler muss ganzzahlig 0 oder größer sein',
     'BadFormat'            => 'Das Format muss ganzzahlig 0 oder größer sein',
     'BadFrameSkip'         => 'Der Auslasszähler für Frames muss ganzzahlig 0 oder größer sein',
     'BadHeight'            => 'Die Höhe muss auf einen gültigen Wert eingestellt sein',

web/lang/dk_dk.php

@@ -128,7 +128,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/en_gb.php

@@ -128,7 +128,7 @@ $SLANG = array(
     'BadChannel'            => 'Channel must be set to an integer of zero or more',
     'BadDevice'             => 'Device must be set to a valid value',
     'BadFormat'             => 'Format must be set to a valid value',
-    'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFrameSkip'          => 'Frame skip count must be an integer of zero or more',
     'BadHeight'             => 'Height must be set to a valid value',
     'BadHost'               => 'Host must be set to a valid ip address or hostname, do not include http://',

web/lang/es_ar.php

@@ -78,7 +78,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/et_ee.php

@@ -124,7 +124,7 @@ $SLANG = array(
     'BadChannel'            => 'Channel must be set to an integer of zero or more',
     'BadDevice'             => 'Device must be set to a valid value',
     'BadFormat'             => 'Format must be set to a valid value',
-    'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval'  => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFrameSkip'          => 'Frame skip count must be an integer of zero or more',
     'BadHeight'             => 'Height must be set to a valid value',
     'BadHost'               => 'Host must be set to a valid ip address or hostname, do not include http://',

web/lang/fr_fr.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/he_il.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/hu_hu.php

@@ -136,7 +136,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'A riadó maximális FPS száma pozitív szám legyen',
     'BadChannel'           => 'A csatorna száma 0 vagy nagyobb egész szám legyen',
     'BadDevice'            => 'Az eszköz érték valós legyen',
-    'BadFPSReportInterval' => 'FPS információs idõköz puffer számlálója 100 vagy nagyobb egész legyen',
+    'BadFPSReportInterval' => 'FPS információs idõköz puffer számlálója 0 vagy nagyobb egész legyen',
     'BadFormat'            => 'A típus 0 vagy nagyobb egész szám legyen',
     'BadFrameSkip'         => 'Képkocka eldobások száma 0 vagy nagyobb egész szám legyen',
     'BadHeight'            => 'A képmagasság érvényes érték legyen képpontban',

web/lang/it_it.php

@@ -132,7 +132,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Il numero massimo di FPS dell\'allarme deve essere un numero intero positivo o un valore in virgola mobile',
     'BadChannel'           => 'Il canale deve essere settato con un numero intero uguale o maggiore di zero',
     'BadDevice'            => 'Il dispositivo deve essere impostato con un valore valido',
-    'BadFPSReportInterval' => 'L\'intervallo di FPS per i report deve essere un numero intero superiore a 100',
+    'BadFPSReportInterval' => 'L\'intervallo di FPS per i report deve essere un numero intero superiore a 0',
     'BadFormat'            => 'Il formato deve essere impostato con un numero intero come 0 o maggiore',
     'BadFrameSkip'         => 'Il numero di Frame da scartare deve essere un intero uguale a 0 o superiore',
     'BadHeight'            => 'L\'altezza deve essere impostata con un valore valido',

web/lang/ja_jp.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/nl_nl.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/pl_pl.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/pt_br.php

@@ -67,7 +67,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/ro_ro.php

@@ -98,7 +98,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/ru_ru.php

@@ -127,7 +127,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Alarm Maximum FPS must be a positive integer or floating point value',
     'BadChannel'           => 'Channel must be set to an integer of zero or more',
     'BadDevice'            => 'Device must be set to a valid value',
-    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 100 or more',
+    'BadFPSReportInterval' => 'FPS report interval buffer count must be an integer of 0 or more',
     'BadFormat'            => 'Format must be set to an integer of zero or more',
     'BadFrameSkip'         => 'Frame skip count must be an integer of zero or more',
     'BadHeight'            => 'Height must be set to a valid value',

web/lang/se_se.php

@@ -128,7 +128,7 @@ $SLANG = array(
     'BadAlarmMaxFPS'       => 'Larm för bilder/s måste vara ett positivt heltal eller ett flyttal',
     'BadChannel'           => 'Kanalen måste vara ett heltal, noll eller högre',
     'BadDevice'            => 'Enheten måste sättas till ett giltigt värde',
-    'BadFPSReportInterval' => 'Buffern för ramintervallrapporten måste vara ett heltal på minst 100 eller högre',
+    'BadFPSReportInterval' => 'Buffern för ramintervallrapporten måste vara ett heltal på minst 0 eller högre',
     'BadFormat'            => 'Formatet måste vara ett heltal, noll eller högre',
     'BadFrameSkip'         => 'Värdet för ramöverhopp måste vara ett heltal på 0 eller högre',
     'BadHeight'            => 'Höjden måste sättas till ett giltigt värde',

web/skins/classic/views/js/monitor.js.php

@@ -115,7 +115,7 @@ function validateForm( form )
         errors[errors.length] = "<?= $SLANG['BadAlarmFrameCount'] ?>";
     if ( !form.elements['newMonitor[SectionLength]'].value || !(parseInt(form.elements['newMonitor[SectionLength]'].value) >= 30 ) )
         errors[errors.length] = "<?= $SLANG['BadSectionLength'] ?>";
-    if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 100 ) )
+    if ( !form.elements['newMonitor[FPSReportInterval]'].value || !(parseInt(form.elements['newMonitor[FPSReportInterval]'].value) >= 0 ) )
         errors[errors.length] = "<?= $SLANG['BadFPSReportInterval'] ?>";
     if ( !form.elements['newMonitor[FrameSkip]'].value || !(parseInt(form.elements['newMonitor[FrameSkip]'].value) >= 0 ) )
         errors[errors.length] = "<?= $SLANG['BadFrameSkip'] ?>";