Make exact beat calculation of tempi a bit less cumbersome. Move tempi on an audio basis for non-musical snap.

1 files changed, 15 insertions, 3 deletions

diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc
index 15323751b4..0ed5a01459 100644
--- a/libs/ardour/tempo.cc
+++ b/libs/ardour/tempo.cc
@@ -2531,6 +2531,14 @@ void
 TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int& sub_num)
 {
 	Metrics future_map;
+	bool was_musical = ts->position_lock_style() == MusicTime;
+
+	if (sub_num == 0 && was_musical) {
+		/* if we're not snapping to music,
+		   AudioTime and MusicTime may be treated identically.
+		*/
+		ts->set_position_lock_style (AudioTime);
+	}
 
 	if (ts->position_lock_style() == MusicTime) {
 		{
@@ -2539,16 +2547,16 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int&
 			TempoSection* tempo_copy = copy_metrics_and_point (_metrics, future_map, ts);
 			double beat = beat_at_frame_locked (future_map, frame);
 
-			if (sub_num > 0) {
+			if (sub_num > 1) {
 				beat = floor (beat) + (floor (((beat - floor (beat)) * (double) sub_num) + 0.5) / sub_num);
-			} else if (sub_num == -2) {
+			} else if (sub_num == 1) {
 				/* snap to beat */
 				beat = floor (beat + 0.5);
 			}
 
 			double pulse = pulse_at_beat_locked (future_map, beat);
 
-			if (sub_num == -3) {
+			if (sub_num == -1) {
 				/* snap to  bar */
 				pulse = floor (pulse + 0.5);
 			}
@@ -2571,6 +2579,10 @@ TempoMap::gui_move_tempo (TempoSection* ts, const framepos_t& frame, const int&
 		}
 	}
 
+	if (sub_num == 0 && was_musical) {
+		ts->set_position_lock_style (MusicTime);
+	}
+
 	Metrics::const_iterator d = future_map.begin();
 	while (d != future_map.end()) {
 		delete (*d);