X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frhythm_ferret.cc;h=d73b376439f61720eff0f030c521d6f80b1ba27f;hb=14fb1367a2fa1d79c282be36df0d7443c081aee2;hp=8845a29313d2a211d483f9bb77ad90a5a0651eae;hpb=5fb296cd6b63ee333a108e0f0847df51019432cd;p=ardour.git diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc index 8845a29313..d73b376439 100644 --- a/gtk2_ardour/rhythm_ferret.cc +++ b/gtk2_ardour/rhythm_ferret.cc @@ -1,21 +1,36 @@ +/* + Copyright (C) 2012 Paul Davis + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + +*/ + #include #include #include "pbd/memento_command.h" #include "pbd/convert.h" -#include "ardour/transient_detector.h" -#include "ardour/onset_detector.h" -#include "ardour/audiosource.h" #include "ardour/audioregion.h" -#include "ardour/playlist.h" -#include "ardour/region_factory.h" +#include "ardour/onset_detector.h" #include "ardour/session.h" +#include "ardour/transient_detector.h" #include "rhythm_ferret.h" #include "audio_region_view.h" #include "editor.h" -#include "utils.h" #include "time_axis_view.h" #include "i18n.h" @@ -43,20 +58,25 @@ static const gchar * _onset_function_strings[] = { N_("Phase Deviation"), N_("Kullback-Liebler"), N_("Modified Kullback-Liebler"), +#ifdef HAVE_AUBIO4 + N_("Spectral Flux"), +#endif 0 }; static const gchar * _operation_strings[] = { N_("Split region"), +#if 0 // these don't do what a user expects N_("Snap regions"), N_("Conform regions"), +#endif 0 }; RhythmFerret::RhythmFerret (Editor& e) : ArdourDialog (_("Rhythm Ferret")) , editor (e) - , detection_threshold_adjustment (0.015, 0.0, 0.1, 0.001, 0.1) + , detection_threshold_adjustment (-35, -80, -6, 1, 6) , detection_threshold_scale (detection_threshold_adjustment) , sensitivity_adjustment (40, 0, 100, 1, 10) , sensitivity_scale (sensitivity_adjustment) @@ -65,6 +85,10 @@ RhythmFerret::RhythmFerret (Editor& e) , peak_picker_threshold_scale (peak_picker_threshold_adjustment) , silence_threshold_adjustment (-90.0, -120.0, 0.0, 1, 10) , silence_threshold_scale (silence_threshold_adjustment) +#ifdef HAVE_AUBIO4 + , minioi_adjustment (4, 0, 40, 1, 5) + , minioi_scale (minioi_adjustment) +#endif , trigger_gap_adjustment (3, 0, 100, 1, 10) , trigger_gap_spinner (trigger_gap_adjustment) , action_button (Stock::APPLY) @@ -99,30 +123,37 @@ RhythmFerret::RhythmFerret (Editor& e) t->attach (onset_detection_function_selector, 1, 2, n, n + 1, FILL); ++n; - t->attach (*manage (new Label (_("Trigger gap"), 1, 0.5)), 0, 1, n, n + 1, FILL); + t->attach (*manage (new Label (_("Trigger gap (postproc)"), 1, 0.5)), 0, 1, n, n + 1, FILL); t->attach (trigger_gap_spinner, 1, 2, n, n + 1, FILL); t->attach (*manage (new Label (_("ms"))), 2, 3, n, n + 1, FILL); ++n; - t->attach (*manage (new Label (_("Threshold"), 1, 0.5)), 0, 1, n, n + 1, FILL); - t->attach (detection_threshold_scale, 1, 2, n, n + 1, FILL); - t->attach (*manage (new Label (_("dB"))), 2, 3, n, n + 1, FILL); - ++n; - t->attach (*manage (new Label (_("Peak threshold"), 1, 0.5)), 0, 1, n, n + 1, FILL); t->attach (peak_picker_threshold_scale, 1, 2, n, n + 1, FILL); - t->attach (*manage (new Label (_("dB"))), 2, 3, n, n + 1, FILL); ++n; - + t->attach (*manage (new Label (_("Silence threshold"), 1, 0.5)), 0, 1, n, n + 1, FILL); t->attach (silence_threshold_scale, 1, 2, n, n + 1, FILL); t->attach (*manage (new Label (_("dB"))), 2, 3, n, n + 1, FILL); ++n; +#ifdef HAVE_AUBIO4 + t->attach (*manage (new Label (_("Min Inter-Onset Time"), 1, 0.5)), 0, 1, n, n + 1, FILL); + t->attach (minioi_scale, 1, 2, n, n + 1, FILL); + t->attach (*manage (new Label (_("ms"))), 2, 3, n, n + 1, FILL); + ++n; +#endif + + t->attach (*manage (new Label (_("Sensitivity"), 1, 0.5)), 0, 1, n, n + 1, FILL); t->attach (sensitivity_scale, 1, 2, n, n + 1, FILL); ++n; + t->attach (*manage (new Label (_("Cut Pos Threshold"), 1, 0.5)), 0, 1, n, n + 1, FILL); + t->attach (detection_threshold_scale, 1, 2, n, n + 1, FILL); + t->attach (*manage (new Label (_("dB"))), 2, 3, n, n + 1, FILL); + ++n; + t->attach (*manage (new Label (_("Operation"), 1, 0.5)), 0, 1, n, n + 1, FILL); t->attach (operation_selector, 1, 2, n, n + 1, FILL); ++n; @@ -145,13 +176,17 @@ void RhythmFerret::analysis_mode_changed () { bool const perc = get_analysis_mode() == PercussionOnset; - - trigger_gap_spinner.set_sensitive (!perc); + + // would be nice to actually hide/show the rows. detection_threshold_scale.set_sensitive (perc); sensitivity_scale.set_sensitive (perc); + trigger_gap_spinner.set_sensitive (!perc); onset_detection_function_selector.set_sensitive (!perc); peak_picker_threshold_scale.set_sensitive (!perc); silence_threshold_scale.set_sensitive (!perc); +#ifdef HAVE_AUBIO4 + minioi_scale.set_sensitive (!perc); +#endif } RhythmFerret::AnalysisMode @@ -209,14 +244,14 @@ RhythmFerret::run_analysis () default: break; } - - (*i)->region()->set_transients (current_results); + + (*i)->region()->set_onsets (current_results); current_results.clear(); } } int -RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readable, framepos_t /*offset*/, AnalysisFeatureList& results) +RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readable, frameoffset_t /*offset*/, AnalysisFeatureList& results) { TransientDetector t (_session->frame_rate()); @@ -225,8 +260,10 @@ RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readabl AnalysisFeatureList these_results; t.reset (); - t.set_threshold (detection_threshold_adjustment.get_value()); - t.set_sensitivity (sensitivity_adjustment.get_value()); + float dB = detection_threshold_adjustment.get_value(); + float coeff = dB > -80.0f ? pow (10.0f, dB * 0.05f) : 0.0f; + t.set_threshold (coeff); + t.set_sensitivity (4, sensitivity_adjustment.get_value()); if (t.run ("", readable.get(), i, these_results)) { continue; @@ -236,7 +273,7 @@ RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr readabl results.insert (results.end(), these_results.begin(), these_results.end()); these_results.clear (); - + t.update_positions (readable.get(), i, results); } @@ -254,16 +291,16 @@ RhythmFerret::get_note_onset_function () return n; } } - + fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal note onset function string"), txt) << endmsg; - - /*NOTREACHED*/ + + abort(); /*NOTREACHED*/ return -1; } int -RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, framepos_t /*offset*/, AnalysisFeatureList& results) +RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, frameoffset_t /*offset*/, AnalysisFeatureList& results) { try { OnsetDetector t (_session->frame_rate()); @@ -272,11 +309,15 @@ RhythmFerret::run_note_onset_analysis (boost::shared_ptr readable, fra AnalysisFeatureList these_results; - t.reset (); - t.set_function (get_note_onset_function()); t.set_silence_threshold (silence_threshold_adjustment.get_value()); t.set_peak_threshold (peak_picker_threshold_adjustment.get_value()); +#ifdef HAVE_AUBIO4 + t.set_minioi (minioi_adjustment.get_value()); +#endif + + // aubio-vamp only picks up new settings on reset. + t.reset (); if (t.run ("", readable.get(), i, these_results)) { continue; @@ -312,6 +353,7 @@ RhythmFerret::do_action () do_split_action (); break; case SnapRegionsToGrid: + // split first, select all.. ?! editor.snap_regions_to_grid(); break; case ConformRegion: @@ -329,23 +371,23 @@ RhythmFerret::do_split_action () performed on the selection only (without entered_regionview or the edit point being considered) */ - RegionSelection regions = editor.get_regions_from_selection(); - + RegionSelection regions = editor.selection->regions; + if (regions.empty()) { return; } - + editor.EditorFreeze(); /* Emit signal */ - _session->begin_reversible_command (_("split regions (rhythm ferret)")); - + editor.begin_reversible_command (_("split regions (rhythm ferret)")); + /* Merge the transient positions for regions in consideration */ AnalysisFeatureList merged_features; - + for (RegionSelection::iterator i = regions.begin(); i != regions.end(); ++i) { AnalysisFeatureList features; - features = (*i)->region()->transients(); + (*i)->region()->transients(features); merged_features.insert (merged_features.end(), features.begin(), features.end()); } @@ -366,8 +408,8 @@ RhythmFerret::do_split_action () i = tmp; } - _session->commit_reversible_command (); - + editor.commit_reversible_command (); + editor.EditorThaw(); /* Emit signal */ } @@ -390,11 +432,11 @@ void RhythmFerret::clear_transients () { current_results.clear (); - + for (RegionSelection::iterator i = regions_with_transients.begin(); i != regions_with_transients.end(); ++i) { - (*i)->region()->set_transients (current_results); + (*i)->region()->set_onsets (current_results); } - + regions_with_transients.clear (); }