Tidy up rhythm ferret dialogue a bit and move its menu option into the Region menu.

git-svn-id: svn://localhost/ardour2/branches/3.0@7029 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 2 insertions, 34 deletions

diff --git a/gtk2_ardour/rhythm_ferret.h b/gtk2_ardour/rhythm_ferret.h
index 68d3d5f9e4..b18a86377c 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"
 
@@ -38,7 +37,6 @@ class RhythmFerret : public ArdourDialog {
 	};
 
 	RhythmFerret (PublicEditor&);
-	~RhythmFerret ();
 
 	void set_session (ARDOUR::Session*);
 
@@ -48,66 +46,36 @@ class RhythmFerret : public ArdourDialog {
   private:
 	PublicEditor& 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;