X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frhythm_ferret.cc;h=4d39232d8c734f713d8eb97394470acabc43683a;hb=25ec63968c0e792217a015c402ac52ae59a85e3b;hp=ec5ebc93a1117d74419e556b506fbac559ab7a83;hpb=e5e12acc5698090f2c0c614385e457cc0b46fbb0;p=ardour.git

diff --git a/gtk2_ardour/rhythm_ferret.cc b/gtk2_ardour/rhythm_ferret.cc
index ec5ebc93a1..4d39232d8c 100644
--- a/gtk2_ardour/rhythm_ferret.cc
+++ b/gtk2_ardour/rhythm_ferret.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    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
@@ -33,7 +33,7 @@
 #include "editor.h"
 #include "time_axis_view.h"
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace std;
 using namespace Gtk;
@@ -58,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)
@@ -80,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)
@@ -114,19 +123,13 @@ 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);
@@ -134,10 +137,23 @@ RhythmFerret::RhythmFerret (Editor& e)
 	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;
@@ -161,12 +177,16 @@ 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
@@ -225,7 +245,7 @@ RhythmFerret::run_analysis ()
 			break;
 		}
 
-		(*i)->region()->set_transients (current_results);
+		(*i)->region()->set_onsets (current_results);
 		current_results.clear();
 	}
 }
@@ -240,8 +260,10 @@ RhythmFerret::run_percussion_onset_analysis (boost::shared_ptr<Readable> 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;
@@ -273,7 +295,7 @@ RhythmFerret::get_note_onset_function ()
 	fatal << string_compose (_("programming error: %1 (%2)"), X_("illegal note onset function string"), txt)
 	      << endmsg;
 
-	/*NOTREACHED*/
+	abort(); /*NOTREACHED*/
 	return -1;
 }
 
@@ -287,11 +309,15 @@ RhythmFerret::run_note_onset_analysis (boost::shared_ptr<Readable> 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;
@@ -327,6 +353,7 @@ RhythmFerret::do_action ()
 		do_split_action ();
 		break;
 	case SnapRegionsToGrid:
+		// split first, select all.. ?!
 		editor.snap_regions_to_grid();
 		break;
 	case ConformRegion:
@@ -352,7 +379,7 @@ RhythmFerret::do_split_action ()
 
 	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;
@@ -360,7 +387,7 @@ RhythmFerret::do_split_action ()
 	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());
 	}
@@ -381,7 +408,7 @@ RhythmFerret::do_split_action ()
 		i = tmp;
 	}
 
-	_session->commit_reversible_command ();
+	editor.commit_reversible_command ();
 
 	editor.EditorThaw(); /* Emit signal */
 }
@@ -407,7 +434,7 @@ 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 ();