X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=a5bfb38f1766b3429c400d8b7a981371246192d9;hb=40e2a6b16b47acf1f19a31f5e6d1cd463c45e1b6;hp=a95c0891d082eb59a4bb28151aa16593cc1e50c0;hpb=8631c4443945140f207cf1194c85c47bb0cc2571;p=ardour.git

diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index a95c0891d0..a5bfb38f17 100644
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -35,6 +35,8 @@
 #include <iostream>
 #include <cmath>
 
+using namespace ARDOUR;
+
 PluginEqGui::PluginEqGui(boost::shared_ptr<ARDOUR::PluginInsert> pluginInsert)
 	: _min_dB(-12.0),
 	  _max_dB(+12.0),
@@ -216,14 +218,14 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size)
 		return;
 
 
-	FFT *tmp1 = _impulse_fft;
-	FFT *tmp2 = _signal_input_fft;
-	FFT *tmp3 = _signal_output_fft;
+        GTKArdour::FFT *tmp1 = _impulse_fft;
+        GTKArdour::FFT *tmp2 = _signal_input_fft;
+        GTKArdour::FFT *tmp3 = _signal_output_fft;
 
 	try {
-		_impulse_fft       = new FFT(size);
-		_signal_input_fft  = new FFT(signal_size);
-		_signal_output_fft = new FFT(signal_size);
+		_impulse_fft       = new GTKArdour::FFT(size);
+		_signal_input_fft  = new GTKArdour::FFT(signal_size);
+		_signal_output_fft = new GTKArdour::FFT(signal_size);
 	} catch( ... ) {
 		// Don't care about lost memory, we're screwed anyhow
 		_impulse_fft       = tmp1;
@@ -282,11 +284,11 @@ PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *o
 	_signal_output_fft->reset();
 
 	for (uint32_t i = 0; i < _plugin_insert->input_streams().n_audio(); ++i) {
-		_signal_input_fft ->analyze(in ->get_audio(i).data(), FFT::HANN);
+		_signal_input_fft ->analyze(in ->get_audio(i).data(), GTKArdour::FFT::HANN);
 	}
 
 	for (uint32_t i = 0; i < _plugin_insert->output_streams().n_audio(); ++i) {
-		_signal_output_fft->analyze(out->get_audio(i).data(), FFT::HANN);
+		_signal_output_fft->analyze(out->get_audio(i).data(), GTKArdour::FFT::HANN);
 	}
 
 	_signal_input_fft ->calculate();
@@ -315,8 +317,8 @@ PluginEqGui::run_impulse_analysis()
 	ARDOUR::ChanMapping in_map(_plugin->get_info()->n_inputs);
 	ARDOUR::ChanMapping out_map(_plugin->get_info()->n_outputs);
 
-	_plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, (nframes_t)0);
-	nframes_t f = _plugin->signal_latency();
+	_plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, 0);
+	framecnt_t f = _plugin->signal_latency ();
 	// Adding user_latency() could be interesting
 
 	// Gather all output, taking latency into account.
@@ -338,8 +340,8 @@ PluginEqGui::run_impulse_analysis()
 	} else {
 		//int C = 0;
 		//std::cerr << (++C) << ": latency is " << f << " frames, doing split processing.." << std::endl;
-		nframes_t target_offset = 0;
-		nframes_t frames_left = _buffer_size; // refaktoroi
+		framecnt_t target_offset = 0;
+		framecnt_t frames_left = _buffer_size; // refaktoroi
 		do {
 			if (f >= _buffer_size) {
 				//std::cerr << (++C) << ": f (=" << f << ") is larger than buffer_size, still trying to reach the actual output" << std::endl;
@@ -351,7 +353,7 @@ PluginEqGui::run_impulse_analysis()
 				//             we start at output offset "f"
 				//             .. and copy "buffer size" - "f" - "offset" frames
 
-				nframes_t length = _buffer_size - f - target_offset;
+				framecnt_t length = _buffer_size - f - target_offset;
 
 				//std::cerr << (++C) << ": copying " << length << " frames to _collect_bufferset.get_audio(i)+" << target_offset << " from bufferset at offset " << f << std::endl;
 				for (uint32_t i = 0; i < outputs; ++i) {
@@ -374,7 +376,7 @@ PluginEqGui::run_impulse_analysis()
 
 				in_map  = ARDOUR::ChanMapping(_plugin->get_info()->n_inputs);
 				out_map = ARDOUR::ChanMapping(_plugin->get_info()->n_outputs);
-				_plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, (nframes_t)0);
+				_plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, 0);
 			}
 		} while ( frames_left > 0);