merge with 2.0-ongoing @ rev 3147

git-svn-id: svn://localhost/ardour2/branches/3.0@3152 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 8 insertions, 3 deletions

diff --git a/gtk2_ardour/fft_result.h b/gtk2_ardour/fft_result.h
index c8f17dc01c..c6c952db1c 100644
--- a/gtk2_ardour/fft_result.h
+++ b/gtk2_ardour/fft_result.h
@@ -41,7 +41,9 @@ class FFTResult
 
 		const int length() { return _dataSize; }
 
-		float sampleAt(int x);
+		float avgAt(int x);
+		float maxAt(int x);
+		float minAt(int x);
 		
 		const float minimum() { return _minimum; }
 		const float maximum() { return _maximum; }
@@ -53,10 +55,13 @@ class FFTResult
 		
 		int 	_averages;
 
-		float*	_data;
+		float*	_data_avg;
+		float*  _data_max;
+		float*  _data_min;
+
 		float*	_work;
 
-		int		_windowSize;
+		int	_windowSize;
 		int 	_dataSize;
 
 		float 	_minimum;