From 765617fd07eb0de6cb2e900644a460f172813efe Mon Sep 17 00:00:00 2001 From: carlh Date: Sun, 16 May 2010 23:43:14 +0000 Subject: [PATCH] When inserting new notes with the pencil tool, make them the length of the grid subvidision. Bug #3132. git-svn-id: svn+ssh://ardour.org/ardour2/branches/3.0@7109 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/midi_region_view.cc | 14 +++++++++----- gtk2_ardour/midi_region_view.h | 1 - 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index a0ccd7b9..b9bbff74 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -76,7 +76,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & : RegionView (parent, tv, r, spu, basic_color) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _default_note_length(1.0) , _current_range_min(0) , _current_range_max(0) , _model_name(string()) @@ -101,7 +100,6 @@ MidiRegionView::MidiRegionView (ArdourCanvas::Group *parent, RouteTimeAxisView & : RegionView (parent, tv, r, spu, basic_color, false, visibility) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _default_note_length(1.0) , _model_name(string()) , _custom_device_mode(string()) , _active_notes(0) @@ -125,7 +123,6 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other) , RegionView (other) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _default_note_length(1.0) , _model_name(string()) , _custom_device_mode(string()) , _active_notes(0) @@ -152,7 +149,6 @@ MidiRegionView::MidiRegionView (const MidiRegionView& other, boost::shared_ptr (region)) , _force_channel(-1) , _last_channel_selection(0xFFFF) - , _default_note_length(1.0) , _model_name(string()) , _custom_device_mode(string()) , _active_notes(0) @@ -493,8 +489,16 @@ MidiRegionView::canvas_event(GdkEvent* ev) clear_selection(); break; case MouseRange: - create_note_at(event_x, event_y, _default_note_length); + { + bool success; + Evoral::MusicalTime beats = trackview.editor().get_grid_type_as_beats (success, trackview.editor().pixel_to_frame (event_x)); + if (!success) { + beats = 1; + } + + create_note_at (event_x, event_y, beats); break; + } default: break; } diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h index ea059530..21d81cf2 100644 --- a/gtk2_ardour/midi_region_view.h +++ b/gtk2_ardour/midi_region_view.h @@ -347,7 +347,6 @@ class MidiRegionView : public RegionView int8_t _force_channel; uint16_t _last_channel_selection; - double _default_note_length; uint8_t _current_range_min; uint8_t _current_range_max; -- 2.11.4.GIT