Make editor route list rec button respect group settings.

[ardour.git] / gtk2_ardour / plugin_eq_gui.cc

diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc
index f28234592c5f5958715a1934c9acb0dabafd2f4b..dd5e024ddff93727b37e9ad9c87271b3c5c7c4ba 100644 (file)
--- a/gtk2_ardour/plugin_eq_gui.cc
+++ b/gtk2_ardour/plugin_eq_gui.cc
@@ -25,6 +25,7 @@
 #include "gui_thread.h"
 #include "ardour/audio_buffer.h"
 #include "ardour/data_type.h"
+#include "ardour/chan_mapping.h"
 
 #include <gtkmm/box.h>
 #include <gtkmm/button.h>
@@ -310,18 +311,16 @@ PluginEqGui::run_impulse_analysis()
 
        // Create the impulse, can't use silence() because consecutive calls won't work
        for (uint32_t i = 0; i < inputs; ++i) {
-               ARDOUR::AudioBuffer &buf = _bufferset.get_audio(i);
-               ARDOUR::Sample *d = buf.data();
+               ARDOUR::AudioBuffer& buf = _bufferset.get_audio(i);
+               ARDOUR::Sample* d = buf.data();
                memset(d, 0, sizeof(ARDOUR::Sample)*_buffer_size);
                *d = 1.0;
        }
 
-       uint32_t x,y;
-       x=y=0;
-
-
+       ARDOUR::ChanMapping in_map(_plugin->get_info()->n_inputs);
+       ARDOUR::ChanMapping out_map(_plugin->get_info()->n_outputs);
 
-       _plugin->connect_and_run(_bufferset, x, y, _buffer_size, (nframes_t)0);
+       _plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, (nframes_t)0);
        nframes_t f = _plugin->signal_latency();
        // Adding user_latency() could be interesting
 
@@ -378,8 +377,9 @@ PluginEqGui::run_impulse_analysis()
                                        memset(d, 0, sizeof(ARDOUR::Sample)*_buffer_size);
                                }
 
-                               x=y=0;
-                               _plugin->connect_and_run(_bufferset, x, y, _buffer_size, (nframes_t)0);
+                               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);
                        }
                } while ( frames_left > 0);
 
@@ -398,7 +398,7 @@ PluginEqGui::run_impulse_analysis()
 }
 
 bool
-PluginEqGui::expose_analysis_area(GdkEventExpose *evt)
+PluginEqGui::expose_analysis_area(GdkEventExpose *)
 {
        redraw_analysis_area();
 
@@ -463,7 +463,7 @@ PluginEqGui::redraw_analysis_area()
 #define PHASE_PROPORTION 0.5
 
 void 
-PluginEqGui::draw_scales_phase(Gtk::Widget *w, cairo_t *cr)
+PluginEqGui::draw_scales_phase(Gtk::Widget */*w*/, cairo_t *cr)
 {
        float y;
        cairo_font_extents_t extents;
@@ -561,7 +561,7 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr)
 }
 
 void
-PluginEqGui::draw_scales_power(Gtk::Widget *w, cairo_t *cr)
+PluginEqGui::draw_scales_power(Gtk::Widget */*w*/, cairo_t *cr)
 {
        static float scales[] = { 30.0, 70.0, 125.0, 250.0, 500.0, 1000.0, 2000.0, 5000.0, 10000.0, 15000.0, 20000.0, -1.0 };