Prevent region drags with the middle button in internal edit mode (#3869).

[ardour.git] / gtk2_ardour / rhythm_ferret.h

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 043b9fe8a71ac716dd581822c8ad81ed6f37c962..8132ad27b5a007f42aabd6771f9fa6bfa35f6e7c 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -12,6 +12,7 @@
 #include <gtkmm/button.h>
 
 #include "ardour_dialog.h"
+#include "region_selection.h"
 
 namespace ARDOUR {
        class Readable;
@@ -32,7 +33,7 @@ class RhythmFerret : public ArdourDialog {
 
        enum Action {
                SplitRegion,
-               DefineTempoMap,
+               SnapRegionsToGrid,
                ConformRegion
        };
 
@@ -79,14 +80,18 @@ class RhythmFerret : public ArdourDialog {
 
        ARDOUR::AnalysisFeatureList current_results;
 
+       void clear_transients ();
+       /** Regions that we have added transient marks to */
+       RegionSelection regions_with_transients;
+
        AnalysisMode get_analysis_mode () const;
        Action get_action() const;
        void analysis_mode_changed ();
        int get_note_onset_function ();
 
        void run_analysis ();
-       int run_percussion_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, nframes64_t offset, ARDOUR::AnalysisFeatureList& results);
-       int run_note_onset_analysis (boost::shared_ptr<ARDOUR::Readable> region, nframes64_t offset, ARDOUR::AnalysisFeatureList& results);
+       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);
 
        void do_action ();
        void do_split_action ();