diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index bae511e031..205ca935c9 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -4708,8 +4708,7 @@ Editor::quantize_region () qd->hide (); if (r == Gtk::RESPONSE_OK) { - Quantize quant (*_session, Plain, - qd->snap_start(), qd->snap_end(), + Quantize quant (*_session, qd->snap_start(), qd->snap_end(), qd->start_grid_size(), qd->end_grid_size(), qd->strength(), qd->swing(), qd->threshold()); diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc index 82b7ef3009..623a5d8033 100644 --- a/gtk2_ardour/quantize_dialog.cc +++ b/gtk2_ardour/quantize_dialog.cc @@ -46,20 +46,11 @@ static const gchar *_grid_strings[] = { 0 }; -static const gchar *_type_strings[] = { - N_("Grid"), - N_("Legato"), - N_("Groove"), - 0 -}; - std::vector QuantizeDialog::grid_strings; -std::vector QuantizeDialog::type_strings; QuantizeDialog::QuantizeDialog (PublicEditor& e) : ArdourDialog (_("Quantize"), false, false) , editor (e) - , type_label (_("Quantize Type")) , strength_adjustment (100.0, 0.0, 100.0, 1.0, 10.0) , strength_spinner (strength_adjustment) , strength_label (_("Strength")) @@ -74,7 +65,6 @@ QuantizeDialog::QuantizeDialog (PublicEditor& e) { if (grid_strings.empty()) { grid_strings = I18N (_grid_strings); - type_strings = I18N (_type_strings); } set_popdown_strings (start_grid_combo, grid_strings); @@ -82,20 +72,12 @@ QuantizeDialog::QuantizeDialog (PublicEditor& e) set_popdown_strings (end_grid_combo, grid_strings); end_grid_combo.set_active_text (grid_strings.front()); - set_popdown_strings (type_combo, type_strings); - type_combo.set_active_text (type_strings.front()); - Table* table = manage (new Table (6, 2)); table->set_spacings (12); table->set_border_width (12); int r = 0; - type_label.set_alignment (0, 0.5); - table->attach (type_label, 0, 1, r, r + 1); - table->attach (type_combo, 1, 2, r, r + 1); - ++r; - table->attach (snap_start_button, 0, 1, r, r + 1); table->attach (start_grid_combo, 1, 2, r, r + 1); ++r; diff --git a/gtk2_ardour/quantize_dialog.h b/gtk2_ardour/quantize_dialog.h index 97cb82c86e..8203875e98 100644 --- a/gtk2_ardour/quantize_dialog.h +++ b/gtk2_ardour/quantize_dialog.h @@ -45,7 +45,6 @@ class QuantizeDialog : public ArdourDialog QuantizeDialog (PublicEditor&); ~QuantizeDialog (); - ARDOUR::QuantizeType type() const; double start_grid_size() const; double end_grid_size() const; bool snap_start() const { return snap_start_button.get_active(); } @@ -57,10 +56,8 @@ class QuantizeDialog : public ArdourDialog private: PublicEditor& editor; - Gtk::ComboBoxText type_combo; Gtk::ComboBoxText start_grid_combo; Gtk::ComboBoxText end_grid_combo; - Gtk::Label type_label; Gtk::Adjustment strength_adjustment; Gtk::SpinButton strength_spinner; Gtk::Label strength_label; diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h index e1ca2b2395..e56927767e 100644 --- a/libs/ardour/ardour/quantize.h +++ b/libs/ardour/ardour/quantize.h @@ -30,8 +30,7 @@ class Session; class Quantize : public MidiOperator { public: - Quantize (ARDOUR::Session&, QuantizeType type, - bool snap_start, bool snap_end, + Quantize (ARDOUR::Session&, bool snap_start, bool snap_end, double start_grid, double end_grid, float strength, float swing, float threshold); ~Quantize (); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 71c00e7520..127c840840 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -510,12 +510,6 @@ namespace ARDOUR { Rectified }; - enum QuantizeType { - Plain, - Legato, - Groove - }; - struct CleanupReport { std::vector paths; size_t space; diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index eea971e197..54c6214ee5 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -122,7 +122,6 @@ setup_enum_writer () MidiModel::PatchChangeDiffCommand::Property _MidiModel_PatchChangeDiffCommand_Property; WaveformScale _WaveformScale; WaveformShape _WaveformShape; - QuantizeType _QuantizeType; Session::PostTransportWork _Session_PostTransportWork; Session::SlaveState _Session_SlaveState; MTC_Status _MIDI_MTC_Status; @@ -577,11 +576,6 @@ setup_enum_writer () REGISTER_ENUM(Rectified); REGISTER(_WaveformShape); - REGISTER_ENUM(Plain); - REGISTER_ENUM(Legato); - REGISTER_ENUM(Groove); - REGISTER(_QuantizeType); - REGISTER_ENUM(AudioTime); REGISTER_ENUM(MusicTime); REGISTER(_PositionLockStyle); diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index 7ede60b578..563b7bf4e7 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -40,8 +40,7 @@ using namespace ARDOUR; * 0.25 = quantize to beats/4, etc. */ -Quantize::Quantize (Session& s, QuantizeType /* type */, - bool snap_start, bool snap_end, +Quantize::Quantize (Session& s, bool snap_start, bool snap_end, double start_grid, double end_grid, float strength, float swing, float threshold) : session (s)