X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Frhythm_ferret.h;h=8132ad27b5a007f42aabd6771f9fa6bfa35f6e7c;hb=92e5a13fd41eba37a2634caf921606b7d915c557;hp=36d445093932ecba1dc7b95afe83d4ed9e093cf4;hpb=9f63ab9931e6478472853bdda58da47ea29ac125;p=ardour.git

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 36d4450939..8132ad27b5 100644
--- a/gtk2_ardour/rhythm_ferret.h
+++ b/gtk2_ardour/rhythm_ferret.h
@@ -10,15 +10,15 @@
 #include <gtkmm/image.h>
 #include <gtkmm/comboboxtext.h>
 #include <gtkmm/button.h>
-#include <gtkmm/label.h>
 
 #include "ardour_dialog.h"
+#include "region_selection.h"
 
 namespace ARDOUR {
 	class Readable;
 }
 
-class PublicEditor;
+class Editor;
 class RegionView;
 
 class RhythmFerret : public ArdourDialog {
@@ -33,68 +33,69 @@ class RhythmFerret : public ArdourDialog {
 
 	enum Action {
 		SplitRegion,
-		DefineTempoMap,
+		SnapRegionsToGrid,
 		ConformRegion
 	};
-	
-	RhythmFerret (PublicEditor&);
-	~RhythmFerret ();
 
-	void set_session (ARDOUR::Session*);
-	
-  private:
-	PublicEditor& editor;
+	RhythmFerret (Editor&);
 
-	Gtk::HBox  upper_hpacker;
-	Gtk::HBox  lower_hpacker;
+	void set_session (ARDOUR::Session*);
 
-	Gtk::Frame operation_frame;
-	Gtk::Frame selection_frame;
-	Gtk::Frame ferret_frame;
+  protected:
+	void on_hide ();
 
-	Gtk::VBox  op_logo_packer;
-	Gtk::Image* logo;
+  private:
+	Editor& editor;
 
-	/* operation frame */
+	Gtk::ComboBoxText operation_selector;
 
-	Gtk::VBox op_packer;
-	Gtk::RadioButtonGroup operation_button_group;
-	Gtk::RadioButton region_split_button;
-	Gtk::RadioButton tempo_button;
-	Gtk::RadioButton region_conform_button;
+	Gtk::ComboBoxText analysis_mode_selector;
 
-	/* analysis frame */
+	/* transient detection widgets */
 
-	Gtk::VBox ferret_packer;
-	Gtk::ComboBoxText analysis_mode_selector;
-	Gtk::Label analysis_mode_label;
 	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;
+
+	/* onset detection widgets */
+
+	Gtk::ComboBoxText onset_detection_function_selector;
+	Gtk::Adjustment peak_picker_threshold_adjustment;
+	Gtk::HScale peak_picker_threshold_scale;
+	Gtk::Adjustment silence_threshold_adjustment;
+	Gtk::HScale silence_threshold_scale;
+
+	/* generic stuff */
+
 	Gtk::Adjustment trigger_gap_adjustment;
 	Gtk::SpinButton trigger_gap_spinner;
-	Gtk::Label trigger_gap_label;
 
-	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;
 
-	std::vector<nframes64_t> 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, std::vector<nframes64_t>& 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 ();
-	void do_region_split (RegionView* rv, const std::vector<nframes64_t>&);
+	void do_region_split (RegionView* rv, const ARDOUR::AnalysisFeatureList&);
 };
 
 #endif /* __gtk2_ardour_rhythm_ferret_h__ */