Fix playhead smoothing when auditioning.

[ardour.git] / gtk2_ardour / rhythm_ferret.h

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index f9ba752acddedf3d4446f83067eb01da46682bc7..5f14509a184a1bca2e90ecf63c910c37ebcc4f83 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -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
@@ -40,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
@@ -59,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;
@@ -85,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 */
 
@@ -109,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 ();