X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=21ec8379928986f26157eb83053f67e27c39aa75;hb=9b17f35576a74d971b2c86558cf1cf1dec2750e0;hp=f28234592c5f5958715a1934c9acb0dabafd2f4b;hpb=28368793415ba934132994d8c10a5e149c1a8d9d;p=ardour.git diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index f28234592c..21ec837992 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -25,6 +25,8 @@ #include "gui_thread.h" #include "ardour/audio_buffer.h" #include "ardour/data_type.h" +#include "ardour/chan_mapping.h" +#include "ardour/session.h" #include #include @@ -33,6 +35,8 @@ #include #include +using namespace ARDOUR; + PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) : _min_dB(-12.0), _max_dB(+12.0), @@ -51,7 +55,7 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) set_buffer_size(4096, 16384); //set_buffer_size(4096, 4096); - _log_coeff = (1.0 - 2.0 * (1000.0/(_samplerate/2.0))) / powf(1000.0/(_samplerate/2.0), 2.0); + _log_coeff = (1.0 - 2.0 * (1000.0/(_samplerate/2.0))) / powf(1000.0/(_samplerate/2.0), 2.0); _log_max = log10f(1 + _log_coeff); @@ -59,19 +63,18 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) _analysis_scale_surface = 0; _analysis_area = new Gtk::DrawingArea(); - _analysis_width = 500.0; - _analysis_height = 500.0; + _analysis_width = 256.0; + _analysis_height = 256.0; _analysis_area->set_size_request(_analysis_width, _analysis_height); _analysis_area->signal_expose_event().connect( sigc::mem_fun (*this, &PluginEqGui::expose_analysis_area)); _analysis_area->signal_size_allocate().connect( sigc::mem_fun (*this, &PluginEqGui::resize_analysis_area)); - // dB selection dBScaleModel = Gtk::ListStore::create(dBColumns); dBScaleCombo = new Gtk::ComboBox(dBScaleModel); - dBScaleCombo -> set_title("dB scale"); + dBScaleCombo->set_title (_("dB scale")); #define ADD_DB_ROW(MIN,MAX,STEP,NAME) \ { \ @@ -95,14 +98,14 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) dBScaleCombo -> signal_changed().connect( sigc::mem_fun(*this, &PluginEqGui::change_dB_scale) ); - Gtk::Label *dBComboLabel = new Gtk::Label("dB scale"); + Gtk::Label *dBComboLabel = new Gtk::Label (_("dB scale")); Gtk::HBox *dBSelectBin = new Gtk::HBox(false, 5); dBSelectBin->add( *manage(dBComboLabel)); dBSelectBin->add( *manage(dBScaleCombo)); - + // Phase checkbutton - _phase_button = new Gtk::CheckButton("Show phase"); + _phase_button = new Gtk::CheckButton (_("Show phase")); _phase_button->set_active(true); _phase_button->signal_toggled().connect( sigc::mem_fun(*this, &PluginEqGui::redraw_scales)); @@ -113,7 +116,7 @@ PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) // Connect the realtime signal collection callback - _plugin_insert->AnalysisDataGathered.connect( sigc::mem_fun(*this, &PluginEqGui::signal_collect_callback )); + _plugin_insert->AnalysisDataGathered.connect (analysis_connection, invalidator (*this), ui_bind (&PluginEqGui::signal_collect_callback, this, _1, _2), gui_context()); } PluginEqGui::~PluginEqGui() @@ -127,7 +130,7 @@ PluginEqGui::~PluginEqGui() delete _signal_output_fft; _plugin->deactivate(); - + // all gui objects are *manage'd by the inherited Table object } @@ -188,7 +191,7 @@ PluginEqGui::change_dB_scale() _min_dB = row[dBColumns.dBMin]; _max_dB = row[dBColumns.dBMax]; _step_dB = row[dBColumns.dBStep]; - + redraw_scales(); } @@ -203,7 +206,7 @@ PluginEqGui::redraw_scales() _analysis_scale_surface = 0; } - _analysis_area->queue_draw(); + _analysis_area->queue_draw(); // TODO: Add graph legend! } @@ -220,9 +223,9 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) 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 FFT(size); + _signal_input_fft = new FFT(signal_size); + _signal_output_fft = new FFT(signal_size); } catch( ... ) { // Don't care about lost memory, we're screwed anyhow _impulse_fft = tmp1; @@ -234,26 +237,21 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) delete tmp1; delete tmp2; delete tmp3; - + _buffer_size = size; _signal_buffer_size = signal_size; - // These are for impulse analysis only, the signal analysis uses the actual - // number of I/O's for the plugininsert - uint32_t inputs = _plugin->get_info()->n_inputs.n_audio(); - uint32_t outputs = _plugin->get_info()->n_outputs.n_audio(); - - // buffers for the signal analysis are ensured inside PluginInsert - uint32_t n_chans = std::max(inputs, outputs); - _bufferset.ensure_buffers(ARDOUR::DataType::AUDIO, n_chans, _buffer_size); - _collect_bufferset.ensure_buffers(ARDOUR::DataType::AUDIO, n_chans, _buffer_size); + ARDOUR::ChanCount count = 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); + } - ARDOUR::ChanCount chanCount(ARDOUR::DataType::AUDIO, n_chans); - _bufferset.set_count(chanCount); - _collect_bufferset.set_count(chanCount); + _bufferset.set_count (count); + _collect_bufferset.set_count (count); } -void +void PluginEqGui::resize_analysis_area(Gtk::Allocation& size) { _analysis_width = (float)size.get_width(); @@ -280,7 +278,7 @@ PluginEqGui::timeout_callback() void PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *out) { - ENSURE_GUI_THREAD(bind (mem_fun (*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(); @@ -288,7 +286,7 @@ PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *o for (uint32_t i = 0; i < _plugin_insert->input_streams().n_audio(); ++i) { _signal_input_fft ->analyze(in ->get_audio(i).data(), 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); } @@ -299,7 +297,7 @@ PluginEqGui::signal_collect_callback(ARDOUR::BufferSet *in, ARDOUR::BufferSet *o _signal_analysis_running = false; // This signals calls expose_analysis_area() - _analysis_area->queue_draw(); + _analysis_area->queue_draw(); } void @@ -310,24 +308,22 @@ 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); - 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. _impulse_fft->reset(); - + // Silence collect buffers to copy data to, can't use silence() because consecutive calls won't work for (uint32_t i = 0; i < outputs; ++i) { ARDOUR::AudioBuffer &buf = _collect_bufferset.get_audio(i); @@ -344,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; @@ -357,12 +353,12 @@ 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) { memcpy(_collect_bufferset.get_audio(i).data(target_offset), - _bufferset.get_audio(i).data() + f, + _bufferset.get_audio(i).data() + f, length * sizeof(float)); } @@ -378,8 +374,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, 0); } } while ( frames_left > 0); @@ -394,11 +391,11 @@ PluginEqGui::run_impulse_analysis() _impulse_fft->calculate(); // This signals calls expose_analysis_area() - _analysis_area->queue_draw(); + _analysis_area->queue_draw(); } bool -PluginEqGui::expose_analysis_area(GdkEventExpose *evt) +PluginEqGui::expose_analysis_area(GdkEventExpose *) { redraw_analysis_area(); @@ -409,8 +406,8 @@ 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_scale_surface = cairo_surface_create_similar(cairo_get_target(ref_cr), + CAIRO_CONTENT_COLOR, _analysis_width, _analysis_height); @@ -425,9 +422,9 @@ PluginEqGui::draw_analysis_scales(cairo_t *ref_cr) if (_phase_button->get_active()) { draw_scales_phase(_analysis_area, cr); } - + cairo_destroy(cr); - + } void @@ -440,7 +437,7 @@ PluginEqGui::redraw_analysis_area() if (_analysis_scale_surface == 0) { draw_analysis_scales(cr); } - + cairo_copy_page(cr); @@ -462,8 +459,8 @@ PluginEqGui::redraw_analysis_area() #define PHASE_PROPORTION 0.5 -void -PluginEqGui::draw_scales_phase(Gtk::Widget *w, cairo_t *cr) +void +PluginEqGui::draw_scales_phase(Gtk::Widget */*w*/, cairo_t *cr) { float y; cairo_font_extents_t extents; @@ -485,16 +482,16 @@ PluginEqGui::draw_scales_phase(Gtk::Widget *w, cairo_t *cr) 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); - + if (i == 0) continue; - + 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); - + y = _analysis_height/2.0 + (float)i*(_analysis_height/8.0)*PHASE_PROPORTION; // label @@ -514,7 +511,7 @@ PluginEqGui::draw_scales_phase(Gtk::Widget *w, cairo_t *cr) } } -void +void PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) { float x,y; @@ -533,7 +530,7 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) x *= _analysis_width; y = _analysis_height/2.0 - (_impulse_fft->phase_at_bin(i)/M_PI)*(_analysis_height/2.0)*PHASE_PROPORTION; - + if ( i == 0 ) { cairo_move_to(cr, x, y); @@ -548,8 +545,8 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - - } + + } prevX = rint(x); avgY += y; @@ -561,10 +558,10 @@ 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 }; - + float divisor = _samplerate / 2.0 / _impulse_fft->bins(); float x; @@ -634,8 +631,8 @@ PluginEqGui::draw_scales_power(Gtk::Widget *w, cairo_t *cr) } } - - + + for (float dB = - _step_dB; dB > _min_dB; dB -= _step_dB ) { snprintf(buf, 256, "%0.0f", dB ); @@ -663,7 +660,7 @@ power_to_dB(float a) return 10.0 * log10f(a); } -void +void PluginEqGui::plot_impulse_amplitude(Gtk::Widget *w, cairo_t *cr) { float x,y; @@ -701,7 +698,7 @@ PluginEqGui::plot_impulse_amplitude(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - + } prevX = rint(x); @@ -735,7 +732,7 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) float power_out = power_to_dB(_signal_output_fft->power_at_bin(i)); 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) @@ -775,7 +772,7 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - + } prevX = rint(x); @@ -785,5 +782,5 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) cairo_stroke(cr); - + }