From: nick_m <mainsbridge@gmail.com>
Date: Mon, 21 Nov 2016 14:59:57 +0000 (+1100)
Subject: NoteCreateDrag - remove some code
X-Git-Tag: 5.5~83
X-Git-Url: https://main.carlh.net/gitweb/?p=ardour.git;a=commitdiff_plain;h=cc1d33a91de47c6e227dae8551250d4c0938917e

NoteCreateDrag - remove some code
---

diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc
index 4e52649850..4cc6d683f5 100644
--- a/gtk2_ardour/editor_drag.cc
+++ b/gtk2_ardour/editor_drag.cc
@@ -6203,16 +6203,12 @@ NoteCreateDrag::~NoteCreateDrag ()
 framecnt_t
 NoteCreateDrag::grid_frames (framepos_t t) const
 {
-	bool success;
-	Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, t);
-	if (!success) {
-		grid_beats = Evoral::Beats(1);
-	}
+
+	const Evoral::Beats grid_beats = _region_view->get_grid_beats (t);
 	const Evoral::Beats t_beats = _region_view->region_frames_to_region_beats (t);
 
 	return _region_view->region_beats_to_region_frames (t_beats + grid_beats)
 		- _region_view->region_beats_to_region_frames (t_beats);
-
 }
 
 void
@@ -6226,11 +6222,7 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 	const framepos_t pf = _drags->current_pointer_frame ();
 	const int32_t divisions = _editor->get_grid_music_divisions (event->button.state);
 
-	bool success = false;
-	Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf);
-	if (!success) {
-		grid_beats = Evoral::Beats(1);
-	}
+	const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf);
 
 	double eqaf = map.exact_qn_at_frame (pf, divisions);
 
@@ -6247,11 +6239,10 @@ NoteCreateDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor)
 			eqaf -= grid_beats.to_double();
 		}
 	}
-	/* minimum initial length is grid beats */
-	const double end_qn = eqaf + grid_beats.to_double();
 
 	_note[0] = map.frame_at_quarter_note (eqaf) - _region_view->region()->position();
-	_note[1] = map.frame_at_quarter_note (end_qn) - _region_view->region()->position();
+	/* minimum initial length is grid beats */
+	_note[1] = map.frame_at_quarter_note (eqaf + grid_beats.to_double()) - _region_view->region()->position();
 
 	MidiStreamView* sv = _region_view->midi_stream_view ();
 	double const x0 = _editor->sample_to_pixel (_note[0]);
@@ -6273,11 +6264,8 @@ NoteCreateDrag::motion (GdkEvent* event, bool)
 	double eqaf = map.exact_qn_at_frame (pf, divisions);
 
 	if (divisions != 0) {
-		bool success = false;
-		Evoral::Beats grid_beats = _editor->get_grid_type_as_beats (success, pf);
-		if (!success) {
-			grid_beats = Evoral::Beats(1);
-		}
+
+		const Evoral::Beats grid_beats = _region_view->get_grid_beats (pf);
 
 		const double qaf = map.quarter_note_at_frame (pf);
 		/* Hack so that we always snap to the note that we are over, instead of snapping
diff --git a/gtk2_ardour/midi_region_view.h b/gtk2_ardour/midi_region_view.h
index b5972cb9d2..9c85401593 100644
--- a/gtk2_ardour/midi_region_view.h
+++ b/gtk2_ardour/midi_region_view.h
@@ -355,6 +355,8 @@ private:
 
 	friend class MidiRubberbandSelectDrag;
 	friend class MidiVerticalSelectDrag;
+	friend class NoteCreateDrag;
+	friend class HitCreateDrag;
 
 	friend class EditNoteDialog;