X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frhythm_ferret.h;h=5f14509a184a1bca2e90ecf63c910c37ebcc4f83;hb=e5a181c323243a03338f5a9934a5df254986370d;hp=8132ad27b5a007f42aabd6771f9fa6bfa35f6e7c;hpb=5f13eb411ee69b4a810de4a7258c39384e5e1d4f;p=ardour.git

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 8132ad27b5..5f14509a18 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -1,3 +1,22 @@
+/*
+    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.
+
+*/
+
 #ifndef __gtk2_ardour_rhythm_ferret_h__
 #define __gtk2_ardour_rhythm_ferret_h__
 
@@ -21,11 +40,12 @@ namespace ARDOUR {
 class Editor;
 class RegionView;
 
-class RhythmFerret : public ArdourDialog {
-  public:
+class RhythmFerret : public ArdourDialog
+{
+public:
 	/* order of these enums must match the _analyse_mode_strings
-	   in rhythm_ferret.cc
-	*/
+	 * in rhythm_ferret.cc
+	 */
 	enum AnalysisMode {
 		PercussionOnset,
 		NoteOnset
@@ -40,11 +60,12 @@ class RhythmFerret : public ArdourDialog {
 	RhythmFerret (Editor&);
 
 	void set_session (ARDOUR::Session*);
+	void on_response (int);
 
-  protected:
+protected:
 	void on_hide ();
 
-  private:
+private:
 	Editor& editor;
 
 	Gtk::ComboBoxText operation_selector;
@@ -66,6 +87,10 @@ class RhythmFerret : public ArdourDialog {
 	Gtk::HScale peak_picker_threshold_scale;
 	Gtk::Adjustment silence_threshold_adjustment;
 	Gtk::HScale silence_threshold_scale;
+#ifdef HAVE_AUBIO4
+	Gtk::Adjustment minioi_adjustment;
+	Gtk::HScale minioi_scale;
+#endif
 
 	/* generic stuff */
 
@@ -90,8 +115,8 @@ class RhythmFerret : public ArdourDialog {
 	int get_note_onset_function ();
 
 	void run_analysis ();
-	int run_percussion_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::frameoffset_t offset, ARDOUR::AnalysisFeatureList& results);
-	int run_note_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::frameoffset_t offset, ARDOUR::AnalysisFeatureList& results);
+	int run_percussion_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results);
+	int run_note_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, ARDOUR::sampleoffset_t offset, ARDOUR::AnalysisFeatureList& results);
 
 	void do_action ();
 	void do_split_action ();