X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frhythm_ferret.h;h=1d846450564f8bd4b00ab0d6c942eb1125fdcc5a;hb=95bb346926e237b903059c83a70e58ed9253eaca;hp=68d3d5f9e46445549df865b715dc21146a4f7a22;hpb=bb9cc45cd22af67ac275a5e73accbe14fee664d8;p=ardour.git

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 68d3d5f9e4..1d84645056 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -10,7 +10,6 @@
 #include <gtkmm/image.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/button.h>
-#include <gtkmm/label.h>
 
 #include "ardour_dialog.h"
 
@@ -18,7 +17,7 @@ namespace ARDOUR {
 	class Readable;
 }
 
-class PublicEditor;
+class Editor;
 class RegionView;
 
 class RhythmFerret : public ArdourDialog {
@@ -37,8 +36,7 @@ class RhythmFerret : public ArdourDialog {
 		ConformRegion
 	};
 
-	RhythmFerret (PublicEditor&);
-	~RhythmFerret ();
+	RhythmFerret (Editor&);
 
 	void set_session (ARDOUR::Session*);
 
@@ -46,68 +44,38 @@ class RhythmFerret : public ArdourDialog {
 	void on_hide ();
 
   private:
-	PublicEditor& editor;
+	Editor& editor;
 
-	Gtk::HBox  upper_hpacker;
-	Gtk::HBox  lower_hpacker;
+	Gtk::ComboBoxText operation_selector;
 
-	Gtk::Frame operation_frame;
-	Gtk::Frame selection_frame;
-	Gtk::Frame ferret_frame;
-
-	Gtk::VBox  op_logo_packer;
-	Gtk::Image* logo;
-
-	/* operation frame */
-
-	Gtk::VBox op_packer;
-	Gtk::RadioButtonGroup operation_button_group;
-	Gtk::RadioButton region_split_button;
-	Gtk::RadioButton tempo_button;
-	Gtk::RadioButton region_conform_button;
-
-	/* analysis frame */
-
-	Gtk::VBox ferret_packer;
 	Gtk::ComboBoxText analysis_mode_selector;
-	Gtk::Label analysis_mode_label;
 
 	/* transient detection widgets */
 
 	Gtk::Adjustment detection_threshold_adjustment;
 	Gtk::HScale detection_threshold_scale;
-	Gtk::Label detection_threshold_label;
 	Gtk::Adjustment sensitivity_adjustment;
 	Gtk::HScale sensitivity_scale;
-	Gtk::Label sensitivity_label;
 	Gtk::Button analyze_button;
-	Gtk::VBox perc_onset_packer;
 
 	/* onset detection widgets */
 
 	Gtk::ComboBoxText onset_detection_function_selector;
-	Gtk::Label onset_function_label;
 	Gtk::Adjustment peak_picker_threshold_adjustment;
 	Gtk::HScale peak_picker_threshold_scale;
-	Gtk::Label peak_picker_label;
 	Gtk::Adjustment silence_threshold_adjustment;
 	Gtk::HScale silence_threshold_scale;
-	Gtk::Label silence_label;
-	Gtk::VBox note_onset_packer;
 
 	/* generic stuff */
 
 	Gtk::Adjustment trigger_gap_adjustment;
 	Gtk::SpinButton trigger_gap_spinner;
-	Gtk::Label trigger_gap_label;
-
-	Gtk::VBox analysis_packer;
 
-	Gtk::Label operation_clarification_label;
 	Gtk::Button action_button;
 
 	std::vector<std::string> analysis_mode_strings;
 	std::vector<std::string> onset_function_strings;
+	std::vector<std::string> operation_strings;
 
 	ARDOUR::AnalysisFeatureList current_results;
 
@@ -117,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 ();