X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=13c475e27c1b4896a7a11b5f58ae18cf8bb12f2e;hb=62a2d6a0647cd636f8711acceccc22142bb899aa;hp=013edd61971f7d1cc0e6547b43eee2be6f3247b9;hpb=110311e1860d6fb18b1985ca47f33126ae69f678;p=ardour.git

diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index 013edd6197..13c475e27c 100644
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -18,22 +18,32 @@
 
 */
 
-#include "plugin_eq_gui.h"
-#include "fft.h"
+#include <math.h>
+#include <iostream>
 
-#include "ardour_ui.h"
-#include "gui_thread.h"
-#include "ardour/audio_buffer.h"
-#include "ardour/data_type.h"
-#include "ardour/chan_mapping.h"
-#include "ardour/session.h"
+#ifdef COMPILER_MSVC
+#include <float.h>
+/* isinf() & isnan() are C99 standards, which older MSVC doesn't provide */
+#define ISINF(val) !((bool)_finite((double)val))
+#define ISNAN(val) (bool)_isnan((double)val)
+#else
+#define ISINF(val) std::isinf((val))
+#define ISNAN(val) std::isnan((val))
+#endif
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
 #include <gtkmm/checkbutton.h>
 
-#include <iostream>
-#include <cmath>
+#include "ardour/audio_buffer.h"
+#include "ardour/data_type.h"
+#include "ardour/chan_mapping.h"
+#include "ardour/session.h"
+
+#include "plugin_eq_gui.h"
+#include "fft.h"
+#include "ardour_ui.h"
+#include "gui_thread.h"
 
 #include "i18n.h"
 
@@ -141,7 +151,7 @@ PluginEqGui::start_listening ()
 	_plugin->activate();
 	set_buffer_size(4096, 16384);
 	// Connect the realtime signal collection callback
-	_plugin_insert->AnalysisDataGathered.connect (analysis_connection, invalidator (*this), ui_bind (&PluginEqGui::signal_collect_callback, this, _1, _2), gui_context());
+	_plugin_insert->AnalysisDataGathered.connect (analysis_connection, invalidator (*this), boost::bind (&PluginEqGui::signal_collect_callback, this, _1, _2), gui_context());
 }
 
 void
@@ -186,7 +196,7 @@ PluginEqGui::on_show()
 		if (!_window_unmap_connection.connected()) {
 			_window_unmap_connection = toplevel->signal_unmap().connect( sigc::mem_fun(this, &PluginEqGui::stop_updating));
 		}
-		
+
 		if (!_window_map_connection.connected()) {
 			_window_map_connection = toplevel->signal_map().connect( sigc::mem_fun(this, &PluginEqGui::start_updating));
 		}
@@ -317,6 +327,9 @@ PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *o
 void
 PluginEqGui::run_impulse_analysis()
 {
+	/* Allocate some thread-local buffers so that Plugin::connect_and_run can use them */
+	ARDOUR_UI::instance()->get_process_buffers ();
+	
 	uint32_t inputs  = _plugin->get_info()->n_inputs.n_audio();
 	uint32_t outputs = _plugin->get_info()->n_outputs.n_audio();
 
@@ -406,6 +419,8 @@ PluginEqGui::run_impulse_analysis()
 
 	// This signals calls expose_analysis_area()
 	_analysis_area->queue_draw();
+
+	ARDOUR_UI::instance()->drop_process_buffers ();
 }
 
 bool
@@ -760,13 +775,13 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr)
 		}
 		*/
 
-		if (std::isinf(power)) {
+		if (ISINF(power)) {
 			if (power < 0) {
 				power = _min_dB - 1.0;
 			} else {
 				power = _max_dB - 1.0;
 			}
-		} else if (std::isnan(power)) {
+		} else if (ISNAN(power)) {
 			power = _min_dB - 1.0;
 		}