X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=104b9a09f86896e99b9b2c593a7df0815dd4539c;hb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;hp=4bf2a5f87913e8143b67c0bc9aa61446c84e9632;hpb=3020b224fa2d6e1b6b8a576e8e8e211e0585f2a2;p=ardour.git diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index 4bf2a5f879..104b9a09f8 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -18,35 +18,35 @@ */ +#include +#include + #ifdef COMPILER_MSVC #include - -// 'std::isinf()' and 'std::isnan()' are not available in MSVC. -#define isinf(val) !((bool)_finite((double)val)) -#define isnan(val) (bool)_isnan((double)val) +/* 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 -using std::isnan; -using std::isinf; +#define ISINF(val) std::isinf((val)) +#define ISNAN(val) std::isnan((val)) #endif -#include "plugin_eq_gui.h" -#include "fft.h" +#include +#include +#include -#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/plugin_insert.h" #include "ardour/session.h" -#include -#include -#include - -#include -#include +#include "plugin_eq_gui.h" +#include "fft.h" +#include "ardour_ui.h" +#include "gui_thread.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; @@ -54,6 +54,8 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) : _min_dB(-12.0) , _max_dB(+12.0) , _step_dB(3.0) + , _buffer_size(0) + , _signal_buffer_size(0) , _impulse_fft(0) , _signal_input_fft(0) , _signal_output_fft(0) @@ -79,10 +81,7 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) // dB selection dBScaleModel = Gtk::ListStore::create(dBColumns); - /* this grotty-looking cast allows compilation against gtkmm 2.24.0, which - added a new ComboBox constructor. - */ - dBScaleCombo = new Gtk::ComboBox ((Glib::RefPtr &) dBScaleModel); + dBScaleCombo = new Gtk::ComboBox (dBScaleModel, false); dBScaleCombo->set_title (_("dB scale")); #define ADD_DB_ROW(MIN,MAX,STEP,NAME) \ @@ -242,9 +241,9 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) return; } - GTKArdour::FFT *tmp1 = _impulse_fft; - GTKArdour::FFT *tmp2 = _signal_input_fft; - GTKArdour::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 GTKArdour::FFT(size); @@ -265,15 +264,17 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) _buffer_size = size; _signal_buffer_size = signal_size; - ARDOUR::ChanCount count = ARDOUR::ChanCount::max (_plugin->get_info()->n_inputs, _plugin->get_info()->n_outputs); + // allocate separate in+out buffers, VST cannot process in-place + ARDOUR::ChanCount acount (_plugin->get_info()->n_inputs + _plugin->get_info()->n_outputs); + ARDOUR::ChanCount ccount = ARDOUR::ChanCount::max (_plugin->get_info()->n_inputs, _plugin->get_info()->n_outputs); for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { - _bufferset.ensure_buffers (*i, count.get (*i), _buffer_size); - _collect_bufferset.ensure_buffers (*i, count.get (*i), _buffer_size); + _bufferset.ensure_buffers (*i, acount.get (*i), _buffer_size); + _collect_bufferset.ensure_buffers (*i, ccount.get (*i), _buffer_size); } - _bufferset.set_count (count); - _collect_bufferset.set_count (count); + _bufferset.set_count (acount); + _collect_bufferset.set_count (ccount); } void @@ -303,7 +304,7 @@ PluginEqGui::timeout_callback() void PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *out) { - ENSURE_GUI_THREAD (*this, &PluginEqGui::signal_collect_callback, in, out) + ENSURE_GUI_THREAD (*this, &PluginEqGui::signal_collect_callback, in, out); _signal_input_fft ->reset(); _signal_output_fft->reset(); @@ -330,7 +331,7 @@ 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(); @@ -344,8 +345,11 @@ PluginEqGui::run_impulse_analysis() ARDOUR::ChanMapping in_map(_plugin->get_info()->n_inputs); ARDOUR::ChanMapping out_map(_plugin->get_info()->n_outputs); + // map output buffers after input buffers (no inplace for VST) + out_map.offset_to (DataType::AUDIO, inputs); - _plugin->connect_and_run(_bufferset, in_map, out_map, _buffer_size, 0); + _plugin->set_block_size (_buffer_size); + _plugin->connect_and_run(_bufferset, 0, _buffer_size, 1.0, in_map, out_map, _buffer_size, 0); framecnt_t f = _plugin->signal_latency (); // Adding user_latency() could be interesting @@ -363,7 +367,7 @@ PluginEqGui::run_impulse_analysis() //std::cerr << "0: no latency, copying full buffer, trivial.." << std::endl; for (uint32_t i = 0; i < outputs; ++i) { memcpy(_collect_bufferset.get_audio(i).data(), - _bufferset.get_audio(i).data(), _buffer_size * sizeof(float)); + _bufferset.get_audio(inputs + i).data(), _buffer_size * sizeof(float)); } } else { //int C = 0; @@ -386,8 +390,8 @@ PluginEqGui::run_impulse_analysis() //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) { memcpy(_collect_bufferset.get_audio(i).data(target_offset), - _bufferset.get_audio(i).data() + f, - length * sizeof(float)); + _bufferset.get_audio(inputs + i).data() + f, + length * sizeof(float)); } target_offset += length; @@ -402,9 +406,7 @@ PluginEqGui::run_impulse_analysis() memset(d, 0, sizeof(ARDOUR::Sample)*_buffer_size); } - 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, 0); + _plugin->connect_and_run (_bufferset, target_offset, target_offset + _buffer_size, 1.0, in_map, out_map, _buffer_size, 0); } } while ( frames_left > 0); @@ -435,16 +437,16 @@ void PluginEqGui::draw_analysis_scales(cairo_t *ref_cr) { // TODO: check whether we need rounding - _analysis_scale_surface = cairo_surface_create_similar(cairo_get_target(ref_cr), - CAIRO_CONTENT_COLOR, - _analysis_width, - _analysis_height); + _analysis_scale_surface = cairo_surface_create_similar (cairo_get_target(ref_cr), + CAIRO_CONTENT_COLOR, + _analysis_width, + _analysis_height); cairo_t *cr = cairo_create (_analysis_scale_surface); - cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); - cairo_rectangle(cr, 0.0, 0.0, _analysis_width, _analysis_height); - cairo_fill(cr); + cairo_set_source_rgb(cr, 0.0, 0.0, 0.0); + cairo_rectangle(cr, 0.0, 0.0, _analysis_width, _analysis_height); + cairo_fill(cr); draw_scales_power(_analysis_area, cr); @@ -452,8 +454,7 @@ PluginEqGui::draw_analysis_scales(cairo_t *ref_cr) draw_scales_phase(_analysis_area, cr); } - cairo_destroy(cr); - + cairo_destroy(cr); } void @@ -461,13 +462,12 @@ PluginEqGui::redraw_analysis_area() { cairo_t *cr; - cr = gdk_cairo_create(GDK_DRAWABLE(_analysis_area->get_window()->gobj())); + cr = gdk_cairo_create(GDK_DRAWABLE(_analysis_area->get_window()->gobj())); if (_analysis_scale_surface == 0) { draw_analysis_scales(cr); } - cairo_copy_page(cr); cairo_set_source_surface(cr, _analysis_scale_surface, 0.0, 0.0); @@ -481,9 +481,7 @@ PluginEqGui::redraw_analysis_area() // TODO: make this optional plot_signal_amplitude_difference(_analysis_area, cr); - cairo_destroy(cr); - - + cairo_destroy(cr); } #define PHASE_PROPORTION 0.5 @@ -502,7 +500,7 @@ PluginEqGui::draw_scales_phase(Gtk::Widget */*w*/, cairo_t *cr) y = _analysis_height/2.0 - (float)i*(_analysis_height/8.0)*PHASE_PROPORTION; - cairo_set_source_rgb(cr, .8, .9, 0.2); + cairo_set_source_rgb(cr, .8, .9, 0.2); if (i == 0) { snprintf(buf,256, "0\u00b0"); } else { @@ -516,7 +514,7 @@ PluginEqGui::draw_scales_phase(Gtk::Widget */*w*/, cairo_t *cr) continue; - cairo_set_source_rgba(cr, .8, .9, 0.2, 0.6/(float)i); + cairo_set_source_rgba(cr, .8, .9, 0.2, 0.6/(float)i); cairo_move_to(cr, 0.0, y); cairo_line_to(cr, _analysis_width, y); @@ -525,13 +523,13 @@ PluginEqGui::draw_scales_phase(Gtk::Widget */*w*/, cairo_t *cr) // label snprintf(buf,256, "-%d\u00b0", (i * 45)); - cairo_set_source_rgb(cr, .8, .9, 0.2); + cairo_set_source_rgb(cr, .8, .9, 0.2); cairo_text_extents(cr, buf, &t_ext); cairo_move_to(cr, _analysis_width - t_ext.width - t_ext.x_bearing - 2.0, y - extents.descent); cairo_show_text(cr, buf); // line - cairo_set_source_rgba(cr, .8, .9, 0.2, 0.6/(float)i); + cairo_set_source_rgba(cr, .8, .9, 0.2, 0.6/(float)i); cairo_move_to(cr, 0.0, y); cairo_line_to(cr, _analysis_width, y); @@ -552,7 +550,7 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) // float width = w->get_width(); float height = w->get_height(); - cairo_set_source_rgba(cr, 0.95, 0.3, 0.2, 1.0); + cairo_set_source_rgba(cr, 0.95, 0.3, 0.2, 1.0); for (uint32_t i = 0; i < _impulse_fft->bins()-1; i++) { // x coordinate of bin i x = log10f(1.0 + (float)i / (float)_impulse_fft->bins() * _log_coeff) / _log_max; @@ -752,7 +750,7 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) // float width = w->get_width(); float height = w->get_height(); - cairo_set_source_rgb(cr, 0.0, 1.0, 0.0); + cairo_set_source_rgb(cr, 0.0, 1.0, 0.0); cairo_set_line_width (cr, 2.5); for (uint32_t i = 0; i < _signal_input_fft->bins()-1; i++) { @@ -764,25 +762,13 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) float power_in = power_to_dB(_signal_input_fft ->power_at_bin(i)); float power = power_out - power_in; - // for SaBer - /* - double p = 10.0 * log10( 1.0 + (double)_signal_output_fft->power_at_bin(i) - (double) - - _signal_input_fft ->power_at_bin(i)); - //p *= 1000000.0; - float power = (float)p; - - if ( (i % 1000) == 0) { - std::cerr << i << ": " << power << std::endl; - } - */ - - if (isinf(power)) { + if (ISINF(power)) { if (power < 0) { power = _min_dB - 1.0; } else { power = _max_dB - 1.0; } - } else if (isnan(power)) { + } else if (ISNAN(power)) { power = _min_dB - 1.0; } @@ -812,6 +798,4 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) } cairo_stroke(cr); - - }