(1) make quantize actually use the main grid setting and not just default to beats...

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

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 96289280046f52d8770891ff9790ac5e2c988dbf..9b14bcdaaf11f6bdf10c059901c6a7ade5c7bf05 100644 (file)
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -4605,7 +4605,7 @@ Command*
 Editor::apply_midi_note_edit_op_to_region (MidiOperator& op, MidiRegionView& mrv)
 {
        Evoral::Sequence<Evoral::MusicalTime>::Notes selected;
-       mrv.selection_as_notelist (selected);
+       mrv.selection_as_notelist (selected, true);
 
        vector<Evoral::Sequence<Evoral::MusicalTime>::Notes> v;
        v.push_back (selected);

diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc
index b9bbff74d105126f8036532ec86574902fef1c06..d1c1656ce36861b487a6c7e709a897bf47498c0b 100644 (file)
--- a/gtk2_ardour/midi_region_view.cc
+++ b/gtk2_ardour/midi_region_view.cc
@@ -2648,13 +2648,22 @@ MidiRegionView::goto_previous_note ()
 }
 
 void
-MidiRegionView::selection_as_notelist (Notes& selected)
+MidiRegionView::selection_as_notelist (Notes& selected, bool allow_all_if_none_selected)
 {
+        bool had_selected = false;
+
        time_sort_events ();
 
        for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
                if ((*i)->selected()) {
                        selected.insert ((*i)->note());
+                        had_selected = true;
+               }
+       }
+        
+        if (allow_all_if_none_selected && !had_selected) {
+                for (Events::iterator i = _events.begin(); i != _events.end(); ++i) {
+                        selected.insert ((*i)->note());
                }
        }
 }

diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index 21d81cf2f8041c441f06c1ff556cd20e73bacc01..3417014b432ab905781f0ef75f0eb6cab1a0da1a 100644 (file)
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -292,7 +292,7 @@ class MidiRegionView : public RegionView
 
        void show_list_editor ();
 
-       void selection_as_notelist (Notes& selected);
+       void selection_as_notelist (Notes& selected, bool allow_all_if_none_selected = false);
 
   protected:
        /** Allows derived types to specify their visibility requirements

diff --git a/gtk2_ardour/quantize_dialog.cc b/gtk2_ardour/quantize_dialog.cc
index 727f2b0db9251c2b9bf93ba674eac6bacd7404b2..fae5813542278828ba958587824fa9aad2d5f1f0 100644 (file)
--- a/gtk2_ardour/quantize_dialog.cc
+++ b/gtk2_ardour/quantize_dialog.cc
@@ -173,7 +173,7 @@ QuantizeDialog::end_grid_size () const
 double
 QuantizeDialog::grid_size_to_musical_time (const string& txt) const
 {
-       if (txt == "main_grid") {
+       if (txt == "main grid") {
                bool success;
 
                Evoral::MusicalTime b = editor.get_grid_type_as_beats (success, 0);
@@ -200,7 +200,7 @@ QuantizeDialog::grid_size_to_musical_time (const string& txt) const
        } else if (txt == _("Beats")) {
                return 1.0;
        }
-
+        
        return 1.0;
 }