Exact beat - provide audio->music mapping for region split.

	- for those not in the know, this series provides a way to
	  remove the temporal distortion introduced when using an
	  audio frame-based gui for music-locked objects.

	  In short, the gui uses an audio frame representation to move
	  objects. It displays the object using frame_at_beat(), quantizing
	  the time value to audio frames. This is fine until the user selects
	  that frame but expects it to be interpreted as a beat.
	  Thus beat_at_frame() would not produce the user-expected beat
	  (temporal quantization error of up to 0.5 audio samples).
	  This is one method of mapping audio time to music time accurately.

1 files changed, 9 insertions, 4 deletions

diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index d22df0a0bf..80a5ee399e 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -151,7 +151,7 @@ Editor::redo (uint32_t n)
 }
 
 void
-Editor::split_regions_at (framepos_t where, RegionSelection& regions)
+Editor::split_regions_at (framepos_t where, RegionSelection& regions, const int32_t& sub_num)
 {
 	bool frozen = false;
 
@@ -226,7 +226,7 @@ Editor::split_regions_at (framepos_t where, RegionSelection& regions)
 
 		if (pl) {
 			pl->clear_changes ();
-			pl->split_region ((*a)->region(), where);
+			pl->split_region ((*a)->region(), where, sub_num);
 			_session->add_command (new StatefulDiffCommand (pl));
 		}
 
@@ -6151,7 +6151,11 @@ Editor::split_region ()
 			return;
 		}
 
-		split_regions_at (where, rs);
+		if (snap_musical()) {
+			split_regions_at (where, rs, get_grid_music_divisions (0));
+		} else {
+			split_regions_at (where, rs, 0);
+		}
 	}
 }
 
@@ -7294,7 +7298,8 @@ Editor::insert_time (
 			(*i)->clear_owned_changes ();
 
 			if (opt == SplitIntersected) {
-				(*i)->split (pos);
+				/* non musical split */
+				(*i)->split (pos, 0);
 			}
 
 			(*i)->shift (pos, frames, (opt == MoveIntersected), ignore_music_glue);