X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fanalysis_window.cc;h=91e6d133624a4479415cf9732f6a59c0e0f5f36b;hb=a5b38fd6dc9ce9d1fb450da493adbc02b787c5e8;hp=ed2b90b34fa29ebeec165df8dfb613b7c3ca01bf;hpb=402cc384ced6cb152c8abe4294009fe0de0a6dea;p=ardour.git diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc index ed2b90b34f..91e6d13362 100644 --- a/gtk2_ardour/analysis_window.cc +++ b/gtk2_ardour/analysis_window.cc @@ -36,31 +36,25 @@ #include "selection.h" #include "audio_region_view.h" -#include "i18n.h" +#include "pbd/i18n.h" using namespace ARDOUR; using namespace PBD; -AnalysisWindow::AnalysisWindow() : - - source_selection_label (_("Signal source")), - source_selection_ranges_rb (_("Selected ranges")), - source_selection_regions_rb (_("Selected regions")), - - display_model_label (_("Display model")), - display_model_composite_separate_rb (_("Composite graphs for each track")), - display_model_composite_all_tracks_rb (_("Composite graph of all tracks")), - - show_minmax_button (_("Show frequency power range")), - show_normalized_button (_("Normalize values")), - - fft_graph (16384) +AnalysisWindow::AnalysisWindow() + : source_selection_label (_("Signal source")) + , source_selection_ranges_rb (_("Selected ranges")) + , source_selection_regions_rb (_("Selected regions")) + , show_minmax_button (_("Show frequency power range")) + , show_normalized_button (_("Fit dB range")) + , show_proportional_button (_("Proportional Spectrum, -18dB")) + , fft_graph (16384) { - set_name(_("FFT analysis window")); - set_title(_("FFT analysis window")); + set_name (_("FFT analysis window")); + set_title (_("Spectral Analysis")); track_list_ready = false; - + // Left side: track list + controls tlmodel = Gtk::ListStore::create(tlcols); track_list.set_model (tlmodel); @@ -73,16 +67,16 @@ AnalysisWindow::AnalysisWindow() : Gtk::TreeViewColumn* track_col = track_list.get_column(0); Gtk::CellRendererText* renderer = dynamic_cast(track_list.get_column_cell_renderer (0)); - + track_col->add_attribute(renderer->property_foreground_gdk(), tlcols.color); track_col->set_expand(true); tlmodel->signal_row_changed().connect ( - mem_fun(*this, &AnalysisWindow::track_list_row_changed) ); - + sigc::mem_fun(*this, &AnalysisWindow::track_list_row_changed) ); + fft_graph.set_analysis_window(this); - + vbox.pack_start(track_list); @@ -94,39 +88,17 @@ AnalysisWindow::AnalysisWindow() : source_selection_regions_rb.set_group(group); source_selection_ranges_rb.set_active(); - + vbox.pack_start (source_selection_ranges_rb, false, false); vbox.pack_start (source_selection_regions_rb, false, false); - + // "Selected ranges" radio source_selection_ranges_rb.signal_toggled().connect ( - bind ( mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_ranges_rb)); + sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_ranges_rb)); // "Selected regions" radio source_selection_regions_rb.signal_toggled().connect ( - bind ( mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_regions_rb)); - } - - vbox.pack_start(hseparator1, false, false); - - // "Display model" - vbox.pack_start(display_model_label, false, false); - { - Gtk::RadioButtonGroup group = display_model_composite_separate_rb.get_group(); - display_model_composite_all_tracks_rb.set_group (group); - - display_model_composite_separate_rb.set_active(); - - vbox.pack_start (display_model_composite_separate_rb, false, false); - vbox.pack_start (display_model_composite_all_tracks_rb, false, false); - - // "Composite graphs for all tracks" - display_model_composite_separate_rb.signal_toggled().connect ( - bind ( mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_separate_rb)); - - // "Composite graph of all tracks" - display_model_composite_all_tracks_rb.signal_toggled().connect ( - bind ( mem_fun(*this, &AnalysisWindow::display_model_changed), &display_model_composite_all_tracks_rb)); + sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::source_selection_changed), &source_selection_regions_rb)); } // Analyze button @@ -134,33 +106,37 @@ AnalysisWindow::AnalysisWindow() : refresh_button.set_name("EditorGTKButton"); refresh_button.set_label(_("Re-analyze data")); - refresh_button.signal_clicked().connect ( bind ( mem_fun(*this, &AnalysisWindow::analyze_data), &refresh_button)); + + refresh_button.signal_clicked().connect ( sigc::bind ( sigc::mem_fun(*this, &AnalysisWindow::analyze_data), &refresh_button)); vbox.pack_start(refresh_button, false, false, 10); + vbox.pack_start(hseparator1, false, false); // Feature checkboxes + // normalize, fit y-range + show_normalized_button.signal_toggled().connect( sigc::mem_fun(*this, &AnalysisWindow::show_normalized_changed)); + vbox.pack_start(show_normalized_button, false, false); + // minmax - show_minmax_button.signal_toggled().connect( mem_fun(*this, &AnalysisWindow::show_minmax_changed)); + show_minmax_button.signal_toggled().connect( sigc::mem_fun(*this, &AnalysisWindow::show_minmax_changed)); vbox.pack_start(show_minmax_button, false, false); - // normalize - show_normalized_button.signal_toggled().connect( mem_fun(*this, &AnalysisWindow::show_normalized_changed)); - vbox.pack_start(show_normalized_button, false, false); + // pink-noise / proportional spectrum + show_proportional_button.signal_toggled().connect( sigc::mem_fun(*this, &AnalysisWindow::show_proportional_changed)); + vbox.pack_start(show_proportional_button, false, false); + - - - hbox.pack_start(vbox, Gtk::PACK_SHRINK); - + // Analysis window on the right fft_graph.ensure_style(); hbox.add(fft_graph); - - + + // And last we pack the hbox add(hbox); @@ -185,6 +161,12 @@ AnalysisWindow::show_normalized_changed() fft_graph.set_show_normalized(show_normalized_button.get_active()); } +void +AnalysisWindow::show_proportional_changed() +{ + fft_graph.set_show_proportioanl(show_proportional_button.get_active()); +} + void AnalysisWindow::set_rangemode() { @@ -197,8 +179,8 @@ AnalysisWindow::set_regionmode() source_selection_regions_rb.set_active(true); } -void -AnalysisWindow::track_list_row_changed(const Gtk::TreeModel::Path& path, const Gtk::TreeModel::iterator& iter) +void +AnalysisWindow::track_list_row_changed(const Gtk::TreeModel::Path& /*path*/, const Gtk::TreeModel::iterator& /*iter*/) { if (track_list_ready) { fft_graph.redraw(); @@ -211,7 +193,7 @@ AnalysisWindow::clear_tracklist() { // Empty track list & free old graphs Gtk::TreeNodeChildren children = track_list.get_model()->children(); - + for (Gtk::TreeIter i = children.begin(); i != children.end(); i++) { Gtk::TreeModel::Row row = *i; @@ -221,10 +203,10 @@ AnalysisWindow::clear_tracklist() // Make sure it's not drawn row[tlcols.graph] = 0; - + delete delete_me; } - + tlmodel->clear(); } @@ -235,52 +217,52 @@ AnalysisWindow::analyze() } void -AnalysisWindow::analyze_data (Gtk::Button *button) +AnalysisWindow::analyze_data (Gtk::Button * /*button*/) { track_list_ready = false; { - Glib::Mutex::Lock lm (track_list_lock); + Glib::Threads::Mutex::Lock lm (track_list_lock); // Empty track list & free old graphs clear_tracklist(); - + // first we gather the FFTResults of all tracks - + Sample *buf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize()); Sample *mixbuf = (Sample *) malloc(sizeof(Sample) * fft_graph.windowSize()); float *gain = (float *) malloc(sizeof(float) * fft_graph.windowSize()); - - Selection s = PublicEditor::instance().get_selection(); - TimeSelection ts = s.time; - RegionSelection ars = s.regions; - - for (TrackSelection::iterator i = s.tracks.begin(); i != s.tracks.end(); ++i) { - boost::shared_ptr pl - = boost::dynamic_pointer_cast((*i)->playlist()); - - if (!pl) - continue; - - RouteUI *rui = dynamic_cast(*i); - int n_inputs = rui->route()->n_inputs().n_audio(); // FFT is audio only - - // Busses don't have playlists, so we need to check that we actually are working with a playlist - if (!pl || !rui) - continue; - - FFTResult *res = fft_graph.prepareResult(rui->color(), rui->route()->name()); - - // if timeSelection - if (source_selection_ranges_rb.get_active()) { -// cerr << "Analyzing ranges on track " << *&rui->route().name() << endl; - + + Selection& s (PublicEditor::instance().get_selection()); + + + // if timeSelection + if (source_selection_ranges_rb.get_active()) { + TimeSelection ts = s.time; + + for (TrackSelection::iterator i = s.tracks.begin(); i != s.tracks.end(); ++i) { + boost::shared_ptr pl + = boost::dynamic_pointer_cast((*i)->playlist()); + + if (!pl) + continue; + + RouteUI *rui = dynamic_cast(*i); + int n_inputs = rui->route()->n_inputs().n_audio(); // FFT is audio only + + // Busses don't have playlists, so we need to check that we actually are working with a playlist + if (!pl || !rui) + continue; + + // std::cerr << "Analyzing ranges on track " << rui->route()->name() << std::endl; + + FFTResult *res = fft_graph.prepareResult(rui->route_color(), rui->route()->name()); for (std::list::iterator j = ts.begin(); j != ts.end(); ++j) { int n; for (int channel = 0; channel < n_inputs; channel++) { - nframes_t x = 0; + samplecnt_t x = 0; - while ( x < (*j).length() ) { + while (x < j->length()) { // TODO: What about stereo+ channels? composite all to one, I guess n = fft_graph.windowSize(); @@ -303,75 +285,82 @@ AnalysisWindow::analyze_data (Gtk::Button *button) } } } - } else if (source_selection_regions_rb.get_active()) { -// cerr << "Analyzing selected regions on track " << *&rui->route().name() << endl; - - TimeAxisView *current_axis = (*i); - - for (RegionSelection::iterator j = ars.begin(); j != ars.end(); ++j) { - // Check that the region is actually audio (so we can analyze it) - AudioRegionView* arv = dynamic_cast(*j); - if (!arv) - continue; - - // Check that the region really is selected on _this_ track/solo - if ( &arv->get_time_axis_view() != current_axis) - continue; - -// cerr << " - " << (*j)->region().name() << ": " << (*j)->region().length() << " samples starting at " << (*j)->region().position() << endl; - int n; - for (int channel = 0; channel < n_inputs; channel++) { + res->finalize(); - nframes_t x = 0; + Gtk::TreeModel::Row newrow = *(tlmodel)->append(); + newrow[tlcols.trackname] = rui->route()->name(); + newrow[tlcols.visible] = true; + newrow[tlcols.color] = rui->route_color (); + newrow[tlcols.graph] = res; + } + } else if (source_selection_regions_rb.get_active()) { + RegionSelection ars = s.regions; + // std::cerr << "Analyzing selected regions" << std::endl; + + for (RegionSelection::iterator j = ars.begin(); j != ars.end(); ++j) { + // Check that the region is actually audio (so we can analyze it) + AudioRegionView* arv = dynamic_cast(*j); + if (!arv) + continue; + + // std::cerr << " - " << (*j)->region().name() << ": " << (*j)->region().length() << " samples starting at " << (*j)->region().position() << std::endl; + RouteTimeAxisView *rtav = dynamic_cast(&arv->get_time_axis_view()); + if (!rtav) { + /* shouldn't happen... */ + continue; + } + FFTResult *res = fft_graph.prepareResult(rtav->color(), arv->get_item_name()); + int n; + for (unsigned int channel = 0; channel < arv->region()->n_channels(); channel++) { - nframes_t length = arv->region()->length(); + samplecnt_t x = 0; + samplecnt_t length = arv->region()->length(); - while ( x < length ) { - // TODO: What about stereo+ channels? composite all to one, I guess + while (x < length) { + // TODO: What about stereo+ channels? composite all to one, I guess - n = fft_graph.windowSize(); - if (x + n >= length ) { - n = length - x; - } + n = fft_graph.windowSize(); + if (x + n >= length ) { + n = length - x; + } - n = arv->audio_region()->read_at(buf, mixbuf, gain, arv->region()->position() + x, n, channel); + memset (buf, 0, n * sizeof (Sample)); + n = arv->audio_region()->read_at(buf, mixbuf, gain, arv->region()->position() + x, n, channel); - if (n == 0) - break; + if (n == 0) + break; - if ( n < fft_graph.windowSize()) { - for (int j = n; j < fft_graph.windowSize(); j++) { - buf[j] = 0.0; - } + if ( n < fft_graph.windowSize()) { + for (int j = n; j < fft_graph.windowSize(); j++) { + buf[j] = 0.0; } - - res->analyzeWindow(buf); - - x += n; } - } -// cerr << "Found: " << (*j)->get_item_name() << endl; + res->analyzeWindow(buf); + x += n; + } } + // std::cerr << "Found: " << (*j)->get_item_name() << std::endl; + res->finalize(); + + Gtk::TreeModel::Row newrow = *(tlmodel)->append(); + newrow[tlcols.trackname] = arv->get_item_name(); + newrow[tlcols.visible] = true; + newrow[tlcols.color] = rtav->color(); + newrow[tlcols.graph] = res; } - res->finalize(); - - Gtk::TreeModel::Row newrow = *(tlmodel)->append(); - newrow[tlcols.trackname] = rui->route()->name(); - newrow[tlcols.visible] = true; - newrow[tlcols.color] = rui->color(); - newrow[tlcols.graph] = res; - } + } + - free(buf); free(mixbuf); + free(gain); track_list_ready = true; } /* end lock */ - + fft_graph.redraw(); } @@ -384,13 +373,13 @@ AnalysisWindow::source_selection_changed (Gtk::RadioButton *button) /* cerr << "AnalysisWindow: signal source = "; - + if (button == &source_selection_ranges_rb) { cerr << "selected ranges" << endl; - + } else if (button == &source_selection_regions_rb) { cerr << "selected regions" << endl; - + } else { cerr << "unknown?" << endl; } @@ -406,7 +395,7 @@ AnalysisWindow::display_model_changed (Gtk::RadioButton *button) /* cerr << "AnalysisWindow: display model = "; - + if (button == &display_model_composite_separate_rb) { cerr << "separate composites of tracks" << endl; } else if (button == &display_model_composite_all_tracks_rb) { @@ -416,5 +405,5 @@ AnalysisWindow::display_model_changed (Gtk::RadioButton *button) } */ } - +