Refactor so that all the locate-related stuff in CursorDrag is in one method. Also...

[ardour.git] / gtk2_ardour / rhythm_ferret.h

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index b18a86377ca0dc516dbca2dc1060589652c26080..1d846450564f8bd4b00ab0d6c942eb1125fdcc5a 100644 (file)
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -17,7 +17,7 @@ namespace ARDOUR {
        class Readable;
 }
 
-class PublicEditor;
+class Editor;
 class RegionView;
 
 class RhythmFerret : public ArdourDialog {
@@ -36,7 +36,7 @@ class RhythmFerret : public ArdourDialog {
                ConformRegion
        };
 
-       RhythmFerret (PublicEditor&);
+       RhythmFerret (Editor&);
 
        void set_session (ARDOUR::Session*);
 
@@ -44,7 +44,7 @@ class RhythmFerret : public ArdourDialog {
        void on_hide ();
 
   private:
-       PublicEditor& editor;
+       Editor& editor;
 
        Gtk::ComboBoxText operation_selector;
 
@@ -85,8 +85,8 @@ class RhythmFerret : public ArdourDialog {
        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 ();