volatile in stupid

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

diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc
index cf8557de82740a602cf0ab792c6289323625b6b1..5c92d2c843a51d559de26f2c28c5fc9b5982768d 100644 (file)
--- a/libs/ardour/transient_detector.cc
+++ b/libs/ardour/transient_detector.cc
@@ -1,3 +1,22 @@
+/*
+    Copyright (C) 2012 Paul Davis 
+
+    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
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #include <cmath>
 
 #include "ardour/readable.h"
@@ -125,23 +144,17 @@ TransientDetector::cleanup_transients (AnalysisFeatureList& t, float sr, float g
 void
 TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFeatureList& positions)
 {
-       Plugin::FeatureSet features;
-
-       Sample* data = 0;
+       int const buff_size = 1024;
+       int const step_size = 64;
 
-       int buff_size = 1024;
-       int step_size = 64;
-
-       data = new Sample[buff_size];
+       Sample* data = new Sample[buff_size];
 
        AnalysisFeatureList::iterator i = positions.begin();
 
        while (i != positions.end()) {
 
-               framecnt_t to_read;
-
                /* read from source */
-               to_read = buff_size;
+               framecnt_t const to_read = buff_size;
 
                if (src->read (data, (*i) - buff_size, to_read, channel) != to_read) {
                        break;
@@ -149,18 +162,18 @@ TransientDetector::update_positions (Readable* src, uint32_t channel, AnalysisFe
 
                // Simple heuristic for locating approx correct cut position.
 
-               for (int j = 0; j < buff_size;){
+               for (int j = 0; j < (buff_size - step_size); ) {
 
-                       Sample s = abs (data[j]);
-                       Sample s2 = abs (data[j + step_size]);
+                       Sample const s = abs (data[j]);
+                       Sample const s2 = abs (data[j + step_size]);
 
-                       if ((s2 - s) > threshold){
+                       if ((s2 - s) > threshold) {
                                //cerr << "Thresh exceeded. Moving pos from: " << (*i) << " to: " << (*i) - buff_size + (j + 16) << endl;
                                (*i) = (*i) - buff_size + (j + 24);
                                break;
                        }
 
-                       j = j + step_size;
+                       j += step_size;
                }
 
                ++i;