Revert "fix issue with generator plugins and no-roll disk monitoring"

[ardour.git] / libs / ardour / kmeterdsp.cc

diff --git a/libs/ardour/kmeterdsp.cc b/libs/ardour/kmeterdsp.cc
index 77d1a87a8135dfee1b2b7fe01bfdc9a800e333e6..d4460f94cb8fe843fb886d7c8c1e07e3def3c272 100644 (file)
--- a/libs/ardour/kmeterdsp.cc
+++ b/libs/ardour/kmeterdsp.cc
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 2008-2011 Fons Adriaensen <fons@linuxaudio.org>
-               Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
+    Adopted for Ardour 2013 by Robin Gareus <robin@gareus.org>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,12 +17,13 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-
 #include <math.h>
-#include "kmeterdsp.h"
+#include "ardour/kmeterdsp.h"
+
 
 float  Kmeterdsp::_omega;
 
+
 Kmeterdsp::Kmeterdsp (void) :
     _z1 (0),
     _z2 (0),
@@ -36,6 +37,10 @@ Kmeterdsp::~Kmeterdsp (void)
 {
 }
 
+void Kmeterdsp::init (int fsamp)
+{
+    _omega = 9.72f / fsamp; // ballistic filter coefficient
+}
 
 void Kmeterdsp::process (float *p, int n)
 {
@@ -46,12 +51,6 @@ void Kmeterdsp::process (float *p, int n)
 
     float  s, t, z1, z2;
 
-    if (_flag) // Display thread has read the rms value.
-    {
-       _rms  = 0;
-       _flag = false;
-    }
-
     // Get filter state.
     z1 = _z1;
     z2 = _z2;
@@ -88,11 +87,19 @@ void Kmeterdsp::process (float *p, int n)
     _z1 = z1 + 1e-20f;
     _z2 = z2 + 1e-20f;
 
-    // Adjust RMS value and update maximum since last read().
     s = sqrtf (2 * z2);
-    if (s > _rms) _rms = s;
-}
 
+    if (_flag) // Display thread has read the rms value.
+    {
+       _rms  = s;
+       _flag = false;
+    }
+    else
+    {
+        // Adjust RMS value and update maximum since last read().
+        if (s > _rms) _rms = s;
+    }
+}
 
 /* Returns highest _rms value since last call */
 float Kmeterdsp::read ()
@@ -102,15 +109,10 @@ float Kmeterdsp::read ()
     return rv;
 }
 
-void Kmeterdsp::init (int fsamp)
-{
-    _omega = 9.72f / fsamp; // ballistic filter coefficient
-}
-
 void Kmeterdsp::reset ()
 {
-    _z1 = _z2 = _rms = 0.0;
-    _flag=false;
+    _z1 = _z2 = _rms = .0f;
+    _flag = false;
 }
 
-/* vi:set ts=8 sts=8 sw=8: */
+/* vi:set ts=8 sts=8 sw=4: */