X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fplugin_eq_gui.cc;h=e4e3c758fe9625fd996587d8f1ab9be1d40b4eb3;hb=c2652437da8786e1a1803486fddf131f20af98d3;hp=bacfbe98b2386653d8b6b0552748120fda433334;hpb=a75868c767dc5a74f4b7361a6255972bad7f7c61;p=ardour.git diff --git a/gtk2_ardour/plugin_eq_gui.cc b/gtk2_ardour/plugin_eq_gui.cc index bacfbe98b2..e4e3c758fe 100644 --- a/gtk2_ardour/plugin_eq_gui.cc +++ b/gtk2_ardour/plugin_eq_gui.cc @@ -18,60 +18,79 @@ */ -#include "plugin_eq_gui.h" -#include "fft.h" - -#include "ardour_ui.h" -#include "gui_thread.h" -#include -#include +#include +#include +#include +#include +#include + +#ifdef COMPILER_MSVC +#include +/* 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 #include #include -#include +#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 "plugin_eq_gui.h" +#include "fft.h" +#include "ardour_ui.h" +#include "gui_thread.h" + +#include "pbd/i18n.h" + +using namespace ARDOUR; PluginEqGui::PluginEqGui(boost::shared_ptr pluginInsert) - : _min_dB(-12.0), - _max_dB(+12.0), - _step_dB(3.0), - _impulse_fft(0), - _signal_input_fft(0), - _signal_output_fft(0), - _plugin_insert(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) + , _plugin_insert(pluginInsert) + , _pointer_in_area_xpos(-1) { _signal_analysis_running = false; - _samplerate = ARDOUR_UI::instance()->the_session()->frame_rate(); - - _plugin = _plugin_insert->get_impulse_analysis_plugin(); - _plugin->activate(); - - set_buffer_size(4096, 16384); - //set_buffer_size(4096, 4096); + _samplerate = ARDOUR_UI::instance()->the_session()->sample_rate(); - _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); - // Setup analysis drawing area _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->add_events(Gdk::POINTER_MOTION_MASK | Gdk::LEAVE_NOTIFY_MASK | Gdk::BUTTON_PRESS_MASK); + _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)); - + _analysis_area->signal_motion_notify_event().connect( sigc::mem_fun (*this, &PluginEqGui::analysis_area_mouseover)); + _analysis_area->signal_leave_notify_event().connect( sigc::mem_fun (*this, &PluginEqGui::analysis_area_mouseexit)); // dB selection dBScaleModel = Gtk::ListStore::create(dBColumns); - dBScaleCombo = new Gtk::ComboBox(dBScaleModel); - dBScaleCombo -> set_title("dB scale"); + dBScaleCombo = new Gtk::ComboBox (dBScaleModel, false); + dBScaleCombo->set_title (_("dB scale")); #define ADD_DB_ROW(MIN,MAX,STEP,NAME) \ { \ @@ -95,42 +114,78 @@ 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 + _signal_button = new Gtk::CheckButton (_("Plot live signal")); + _signal_button->set_active(true); + // 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)); - // populate table - attach( *manage(_analysis_area), 1, 3, 1, 2); - attach( *manage(dBSelectBin), 1, 2, 2, 3, Gtk::SHRINK, Gtk::SHRINK); - attach( *manage(_phase_button), 2, 3, 2, 3, Gtk::SHRINK, Gtk::SHRINK); - + // Freq/dB info for mouse over + _pointer_info = new Gtk::Label ("", 1, 0.5); + _pointer_info->set_size_request(_analysis_width / 4, -1); + _pointer_info->set_name("PluginAnalysisInfoLabel"); - // Connect the realtime signal collection callback - _plugin_insert->AnalysisDataGathered.connect( sigc::mem_fun(*this, &PluginEqGui::signal_collect_callback )); + // populate table + attach (*manage(_analysis_area), 0, 4, 0, 1); + attach (*manage(dBSelectBin), 0, 1, 1, 2, Gtk::SHRINK, Gtk::SHRINK); + attach (*manage(_signal_button), 1, 2, 1, 2, Gtk::SHRINK, Gtk::SHRINK); + attach (*manage(_phase_button), 2, 3, 1, 2, Gtk::SHRINK, Gtk::SHRINK); + attach (*manage(_pointer_info), 3, 4, 1, 2, Gtk::FILL, Gtk::SHRINK); } PluginEqGui::~PluginEqGui() { + stop_listening (); + if (_analysis_scale_surface) { cairo_surface_destroy (_analysis_scale_surface); } delete _impulse_fft; + _impulse_fft = 0; delete _signal_input_fft; + _signal_input_fft = 0; delete _signal_output_fft; + _signal_output_fft = 0; - _plugin->deactivate(); - // all gui objects are *manage'd by the inherited Table object } +static inline float +power_to_dB(float a) +{ + return 10.0 * log10f(a); +} + +void +PluginEqGui::start_listening () +{ + if (!_plugin) { + _plugin = _plugin_insert->get_impulse_analysis_plugin(); + } + + _plugin->activate(); + set_buffer_size(4096, 16384); + _plugin->set_block_size (_buffer_size); + // Connect the realtime signal collection callback + _plugin_insert->AnalysisDataGathered.connect (analysis_connection, invalidator (*this), boost::bind (&PluginEqGui::signal_collect_callback, this, _1, _2), gui_context()); +} + +void +PluginEqGui::stop_listening () +{ + analysis_connection.disconnect (); + _plugin->deactivate (); +} void PluginEqGui::on_hide() @@ -163,18 +218,15 @@ PluginEqGui::on_show() start_updating(); Gtk::Widget *toplevel = get_toplevel(); - if (!toplevel) { - std::cerr << "No toplevel widget for PluginEqGui?!?!" << std::endl; - } - - if (!_window_unmap_connection.connected()) { - _window_unmap_connection = toplevel->signal_unmap().connect( sigc::mem_fun(this, &PluginEqGui::stop_updating)); - } + if (toplevel) { + 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)); + if (!_window_map_connection.connected()) { + _window_map_connection = toplevel->signal_map().connect( sigc::mem_fun(this, &PluginEqGui::start_updating)); + } } - } void @@ -188,7 +240,7 @@ PluginEqGui::change_dB_scale() _min_dB = row[dBColumns.dBMin]; _max_dB = row[dBColumns.dBMax]; _step_dB = row[dBColumns.dBStep]; - + redraw_scales(); } @@ -203,7 +255,7 @@ PluginEqGui::redraw_scales() _analysis_scale_surface = 0; } - _analysis_area->queue_draw(); + _analysis_area->queue_draw(); // TODO: Add graph legend! } @@ -211,18 +263,18 @@ PluginEqGui::redraw_scales() void PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) { - if (_buffer_size == size && _signal_buffer_size == signal_size) + if (_buffer_size == size && _signal_buffer_size == 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; @@ -231,28 +283,28 @@ PluginEqGui::set_buffer_size(uint32_t size, uint32_t signal_size) throw; } - if (tmp1) delete tmp1; - if (tmp2) delete tmp1; - if (tmp3) delete tmp1; - + 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(); + // 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); - // 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); + for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { + _bufferset.ensure_buffers (*i, acount.get (*i), _buffer_size); + _collect_bufferset.ensure_buffers (*i, ccount.get (*i), _buffer_size); + } - ARDOUR::ChanCount chanCount(ARDOUR::DataType::AUDIO, n_chans); - _bufferset.set_count(chanCount); + _bufferset.set_count (acount); + _collect_bufferset.set_count (ccount); } -void -PluginEqGui::resize_analysis_area(Gtk::Allocation& size) +void +PluginEqGui::resize_analysis_area (Gtk::Allocation& size) { _analysis_width = (float)size.get_width(); _analysis_height = (float)size.get_height(); @@ -261,6 +313,8 @@ PluginEqGui::resize_analysis_area(Gtk::Allocation& size) cairo_surface_destroy (_analysis_scale_surface); _analysis_scale_surface = 0; } + + _pointer_info->set_size_request(_analysis_width / 4, -1); } bool @@ -278,17 +332,17 @@ 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(); for (uint32_t i = 0; i < _plugin_insert->input_streams().n_audio(); ++i) { - _signal_input_fft ->analyze(in ->get_audio(i).data(_signal_buffer_size, 0), 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(_signal_buffer_size, 0), FFT::HANN); + _signal_output_fft->analyze(out->get_audio(i).data(), GTKArdour::FFT::HANN); } _signal_input_fft ->calculate(); @@ -297,72 +351,186 @@ 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 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(); // 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(_buffer_size, 0); + 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; - _plugin->connect_and_run(_bufferset, x, y, _buffer_size, (nframes_t)0); + 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, 0, _buffer_size, 1.0, in_map, out_map, _buffer_size, 0); + samplecnt_t f = _plugin->signal_latency (); + // Adding user_latency() could be interesting - // Analyze all output buffers + // 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); + ARDOUR::Sample *d = buf.data(); + memset(d, 0, sizeof(ARDOUR::Sample)*_buffer_size); + } + + if (f == 0) { + //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(inputs + i).data(), _buffer_size * sizeof(float)); + } + } else { + //int C = 0; + //std::cerr << (++C) << ": latency is " << f << " samples, doing split processing.." << std::endl; + samplecnt_t target_offset = 0; + samplecnt_t samples_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; + // there is no data in this buffer regarding to the input! + f -= _buffer_size; + } else { + // this buffer contains either the first, last or a whole bu the output of the impulse + // first part: offset is 0, so we copy to the start of _collect_bufferset + // we start at output offset "f" + // .. and copy "buffer size" - "f" - "offset" samples + + samplecnt_t length = _buffer_size - f - target_offset; + + //std::cerr << (++C) << ": copying " << length << " samples 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(inputs + i).data() + f, + length * sizeof(float)); + } + + target_offset += length; + samples_left -= length; + f = 0; + } + if (samples_left > 0) { + // Silence the buffers + for (uint32_t i = 0; i < inputs; ++i) { + ARDOUR::AudioBuffer &buf = _bufferset.get_audio(i); + ARDOUR::Sample *d = buf.data(); + memset(d, 0, sizeof(ARDOUR::Sample)*_buffer_size); + } + + _plugin->connect_and_run (_bufferset, target_offset, target_offset + _buffer_size, 1.0, in_map, out_map, _buffer_size, 0); + } + } while ( samples_left > 0); + + } + + for (uint32_t i = 0; i < outputs; ++i) { - _impulse_fft->analyze(_bufferset.get_audio(i).data(_buffer_size, 0)); + _impulse_fft->analyze(_collect_bufferset.get_audio(i).data()); } // normalize the output _impulse_fft->calculate(); // This signals calls expose_analysis_area() - _analysis_area->queue_draw(); + _analysis_area->queue_draw(); + ARDOUR_UI::instance()->drop_process_buffers (); +} + +void +PluginEqGui::update_pointer_info(float x) +{ + /* find the bin corresponding to x (see plot_impulse_amplitude) */ + int i = roundf ((powf (10, _log_max * x / _analysis_width) - 1.0) * _impulse_fft->bins() / _log_coeff); + float dB = power_to_dB (_impulse_fft->power_at_bin (i)); + /* calc freq corresponding to bin */ + const int freq = std::max (1, (int) roundf((float)i / (float)_impulse_fft->bins() * _samplerate / 2.f)); + + _pointer_in_area_freq = round (_analysis_width * log10f(1.0 + (float)i / (float)_impulse_fft->bins() * _log_coeff) / _log_max); + + std::stringstream ss; + ss << std::fixed; + if (freq >= 10000) { + ss << std::setprecision (1) << freq / 1000.0 << "kHz"; + } else if (freq >= 1000) { + ss << std::setprecision (2) << freq / 1000.0 << "kHz"; + } else { + ss << std::setprecision (0) << freq << "Hz"; + } + ss << " " << std::setw(6) << std::setprecision (1) << std::showpos << dB; + ss << std::setw(0) << "dB"; + + if (_phase_button->get_active()) { + float phase = 180. * _impulse_fft->phase_at_bin (i) / M_PI; + ss << " " << std::setw(6) << std::setprecision (1) << std::showpos << phase; + ss << std::setw(0) << "\u00B0"; + } + _pointer_info->set_text(ss.str()); } bool -PluginEqGui::expose_analysis_area(GdkEventExpose *evt) +PluginEqGui::analysis_area_mouseover(GdkEventMotion *event) { - redraw_analysis_area(); + update_pointer_info(event->x); + _pointer_in_area_xpos = event->x; + _analysis_area->queue_draw(); + return true; +} + +bool +PluginEqGui::analysis_area_mouseexit(GdkEventCrossing *) +{ + _pointer_info->set_text(""); + _pointer_in_area_xpos = -1; + _analysis_area->queue_draw(); + return true; +} - return false; +bool +PluginEqGui::expose_analysis_area(GdkEventExpose *) +{ + redraw_analysis_area(); + return true; } 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); if (_phase_button->get_active()) { draw_scales_phase(_analysis_area, cr); } - - cairo_destroy(cr); - + + cairo_destroy(cr); } void @@ -370,35 +538,51 @@ 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); cairo_paint(cr); + cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND); + if (_phase_button->get_active()) { plot_impulse_phase(_analysis_area, cr); } + plot_impulse_amplitude(_analysis_area, cr); - // TODO: make this optional - plot_signal_amplitude_difference(_analysis_area, cr); + if (_pointer_in_area_xpos >= 0) { + update_pointer_info (_pointer_in_area_xpos); + } - cairo_destroy(cr); + if (_signal_button->get_active()) { + plot_signal_amplitude_difference(_analysis_area, cr); + } + if (_pointer_in_area_xpos >= 0 && _pointer_in_area_freq > 0) { + const double dashed[] = {0.0, 2.0}; + cairo_set_dash (cr, dashed, 2, 0); + cairo_set_line_cap (cr, CAIRO_LINE_CAP_ROUND); + cairo_set_source_rgb (cr, 1.0, 1.0, 1.0); + cairo_set_line_width (cr, 1.0); + cairo_move_to (cr, _pointer_in_area_freq - .5, -.5); + cairo_line_to (cr, _pointer_in_area_freq - .5, _analysis_height - .5); + cairo_stroke(cr); + } + cairo_destroy(cr); } #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; @@ -411,7 +595,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 { @@ -420,27 +604,27 @@ 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_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 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); @@ -449,7 +633,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; @@ -458,17 +642,17 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) float avgY = 0.0; int avgNum = 0; - float width = w->get_width(); + // 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; 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); @@ -483,8 +667,8 @@ PluginEqGui::plot_impulse_phase(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - - } + + } prevX = rint(x); avgY += y; @@ -496,10 +680,13 @@ 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) { + if (_impulse_fft == 0) { + return; + } + 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; @@ -508,7 +695,7 @@ PluginEqGui::draw_scales_power(Gtk::Widget *w, cairo_t *cr) cairo_font_extents_t extents; cairo_font_extents(cr, &extents); - float fontXOffset = extents.descent + 1.0; + // float fontXOffset = extents.descent + 1.0; char buf[256]; @@ -569,8 +756,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 ); @@ -592,25 +779,18 @@ PluginEqGui::draw_scales_power(Gtk::Widget *w, cairo_t *cr) } -inline float -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; - int prevX = 0; float avgY = 0.0; int avgNum = 0; - float width = w->get_width(); + // float width = w->get_width(); float height = w->get_height(); - cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); + cairo_set_source_rgb(cr, 1.0, 1.0, 1.0); cairo_set_line_width (cr, 2.5); for (uint32_t i = 0; i < _impulse_fft->bins()-1; i++) { @@ -636,7 +816,7 @@ PluginEqGui::plot_impulse_amplitude(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - + } prevX = rint(x); @@ -656,42 +836,23 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) float avgY = 0.0; int avgNum = 0; - float width = w->get_width(); + // float width = w->get_width(); float height = w->get_height(); - cairo_set_source_rgb(cr, 0.0, 1.0, 0.0); - cairo_set_line_width (cr, 2.5); + cairo_set_source_rgb(cr, 0.0, 1.0, 0.0); + cairo_set_line_width (cr, 1.5); for (uint32_t i = 0; i < _signal_input_fft->bins()-1; i++) { // x coordinate of bin i x = log10f(1.0 + (float)i / (float)_signal_input_fft->bins() * _log_coeff) / _log_max; x *= _analysis_width; - 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) - - _signal_input_fft ->power_at_bin(i)); - //p *= 1000000.0; - float power = (float)p; - - if ( (i % 1000) == 0) { - std::cerr << i << ": " << power << std::endl; - } - */ + float power_out = _signal_output_fft->power_at_bin (i) + 1e-30; + float power_in = _signal_input_fft ->power_at_bin (i) + 1e-30; + float power = power_to_dB (power_out / power_in); - if (isinf(power)) { - if (power < 0) { - power = _min_dB - 1.0; - } else { - power = _max_dB - 1.0; - } - } else if (isnan(power)) { - power = _min_dB - 1.0; - } + assert (!ISINF(power)); + assert (!ISNAN(power)); float yCoeff = ( power - _min_dB) / (_max_dB - _min_dB); @@ -710,7 +871,7 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) avgY = 0; avgNum = 0; - + } prevX = rint(x); @@ -719,6 +880,4 @@ PluginEqGui::plot_signal_amplitude_difference(Gtk::Widget *w, cairo_t *cr) } cairo_stroke(cr); - - }