Fix quantization and other time-related ops.

[ardour.git] / gtk2_ardour / editor.cc

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index ac59ecab4fda1e0df317e4400a83fd26f00be2e9..ce6e6b15ae5ca0a32b5617fa46a983b4b69a8a6b 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -2104,12 +2104,11 @@ Editor::set_edit_point_preference (EditPoint ep, bool force)
        bool changed = (_edit_point != ep);
 
        _edit_point = ep;
-       string str = edit_point_strings[(int)ep];
-
        if (Profile->get_mixbus())
                if (ep == EditAtSelectedMarker)
                        ep = EditAtPlayhead;
-       
+
+       string str = edit_point_strings[(int)ep];
        if (str != edit_point_selector.get_text ()) {
                edit_point_selector.set_text (str);
        }
@@ -2588,7 +2587,10 @@ Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool
 
        switch (_snap_type) {
        case SnapToTimecodeFrame:
-               if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   fmod((double)start, (double)_session->frames_per_timecode_frame()) == 0) {
+                       /* start is already on a whole timecode frame, do nothing */
+               } else if (((direction == 0) && (fmod((double)start, (double)_session->frames_per_timecode_frame()) > (_session->frames_per_timecode_frame() / 2))) || (direction > 0)) {
                        start = (framepos_t) (ceil ((double) start / _session->frames_per_timecode_frame()) * _session->frames_per_timecode_frame());
                } else {
                        start = (framepos_t) (floor ((double) start / _session->frames_per_timecode_frame()) *  _session->frames_per_timecode_frame());
@@ -2601,7 +2603,10 @@ Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool
                } else {
                        start -= _session->config.get_timecode_offset ();
                }
-               if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   (start % one_timecode_second == 0)) {
+                       /* start is already on a whole second, do nothing */
+               } else if (((direction == 0) && (start % one_timecode_second > one_timecode_second / 2)) || direction > 0) {
                        start = (framepos_t) ceil ((double) start / one_timecode_second) * one_timecode_second;
                } else {
                        start = (framepos_t) floor ((double) start / one_timecode_second) * one_timecode_second;
@@ -2620,7 +2625,10 @@ Editor::timecode_snap_to_internal (framepos_t& start, RoundMode direction, bool
                } else {
                        start -= _session->config.get_timecode_offset ();
                }
-               if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   (start % one_timecode_minute == 0)) {
+                       /* start is already on a whole minute, do nothing */
+               } else if (((direction == 0) && (start % one_timecode_minute > one_timecode_minute / 2)) || direction > 0) {
                        start = (framepos_t) ceil ((double) start / one_timecode_minute) * one_timecode_minute;
                } else {
                        start = (framepos_t) floor ((double) start / one_timecode_minute) * one_timecode_minute;
@@ -2653,7 +2661,10 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark)
                return timecode_snap_to_internal (start, direction, for_mark);
 
        case SnapToCDFrame:
-               if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   start % (one_second/75) == 0) {
+                       /* start is already on a whole CD frame, do nothing */
+               } else if (((direction == 0) && (start % (one_second/75) > (one_second/75) / 2)) || (direction > 0)) {
                        start = (framepos_t) ceil ((double) start / (one_second / 75)) * (one_second / 75);
                } else {
                        start = (framepos_t) floor ((double) start / (one_second / 75)) * (one_second / 75);
@@ -2661,7 +2672,10 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark)
                break;
 
        case SnapToSeconds:
-               if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   start % one_second == 0) {
+                       /* start is already on a whole second, do nothing */
+               } else if (((direction == 0) && (start % one_second > one_second / 2)) || (direction > 0)) {
                        start = (framepos_t) ceil ((double) start / one_second) * one_second;
                } else {
                        start = (framepos_t) floor ((double) start / one_second) * one_second;
@@ -2669,7 +2683,10 @@ Editor::snap_to_internal (framepos_t& start, RoundMode direction, bool for_mark)
                break;
 
        case SnapToMinutes:
-               if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) {
+               if ((direction == RoundUpMaybe || direction == RoundDownMaybe) &&
+                   start % one_minute == 0) {
+                       /* start is already on a whole minute, do nothing */
+               } else if (((direction == 0) && (start % one_minute > one_minute / 2)) || (direction > 0)) {
                        start = (framepos_t) ceil ((double) start / one_minute) * one_minute;
                } else {
                        start = (framepos_t) floor ((double) start / one_minute) * one_minute;
@@ -3869,16 +3886,10 @@ Editor::get_paste_offset (framepos_t pos, unsigned paste_count, framecnt_t durat
        /* calculate basic unsnapped multi-paste offset */
        framecnt_t offset = paste_count * duration;
 
-       bool   success    = true;
-       double snap_beats = get_grid_type_as_beats(success, pos);
-       if (success) {
-               /* we're snapped to something musical, round duration up */
-               BeatsFramesConverter      conv(_session->tempo_map(), pos);
-               const Evoral::MusicalTime dur_beats      = conv.from(duration);
-               const framecnt_t          snap_dur_beats = ceil(dur_beats / snap_beats) * snap_beats;
-
-               offset = paste_count * conv.to(snap_dur_beats);
-       }
+       /* snap offset so pos + offset is aligned to the grid */
+       framepos_t offset_pos = pos + offset;
+       snap_to(offset_pos, RoundUpMaybe);
+       offset = offset_pos - pos;
 
        return offset;
 }
@@ -3890,64 +3901,64 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
 
        switch (_snap_type) {
        case SnapToBeat:
-               return 1.0;
+               return Evoral::MusicalTime(1.0);
                break;
 
        case SnapToBeatDiv128:
-               return 1.0/128.0;
+               return Evoral::MusicalTime(1.0/128.0);
                break;
        case SnapToBeatDiv64:
-               return 1.0/64.0;
+               return Evoral::MusicalTime(1.0/64.0);
                break;
        case SnapToBeatDiv32:
-               return 1.0/32.0;
+               return Evoral::MusicalTime(1.0/32.0);
                break;
        case SnapToBeatDiv28:
-               return 1.0/28.0;
+               return Evoral::MusicalTime(1.0/28.0);
                break;
        case SnapToBeatDiv24:
-               return 1.0/24.0;
+               return Evoral::MusicalTime(1.0/24.0);
                break;
        case SnapToBeatDiv20:
-               return 1.0/20.0;
+               return Evoral::MusicalTime(1.0/20.0);
                break;
        case SnapToBeatDiv16:
-               return 1.0/16.0;
+               return Evoral::MusicalTime(1.0/16.0);
                break;
        case SnapToBeatDiv14:
-               return 1.0/14.0;
+               return Evoral::MusicalTime(1.0/14.0);
                break;
        case SnapToBeatDiv12:
-               return 1.0/12.0;
+               return Evoral::MusicalTime(1.0/12.0);
                break;
        case SnapToBeatDiv10:
-               return 1.0/10.0;
+               return Evoral::MusicalTime(1.0/10.0);
                break;
        case SnapToBeatDiv8:
-               return 1.0/8.0;
+               return Evoral::MusicalTime(1.0/8.0);
                break;
        case SnapToBeatDiv7:
-               return 1.0/7.0;
+               return Evoral::MusicalTime(1.0/7.0);
                break;
        case SnapToBeatDiv6:
-               return 1.0/6.0;
+               return Evoral::MusicalTime(1.0/6.0);
                break;
        case SnapToBeatDiv5:
-               return 1.0/5.0;
+               return Evoral::MusicalTime(1.0/5.0);
                break;
        case SnapToBeatDiv4:
-               return 1.0/4.0;
+               return Evoral::MusicalTime(1.0/4.0);
                break;
        case SnapToBeatDiv3:
-               return 1.0/3.0;
+               return Evoral::MusicalTime(1.0/3.0);
                break;
        case SnapToBeatDiv2:
-               return 1.0/2.0;
+               return Evoral::MusicalTime(1.0/2.0);
                break;
 
        case SnapToBar:
                if (_session) {
-                       return _session->tempo_map().meter_at (position).divisions_per_bar();
+                       return Evoral::MusicalTime(_session->tempo_map().meter_at (position).divisions_per_bar());
                }
                break;
 
@@ -3966,7 +3977,7 @@ Editor::get_grid_type_as_beats (bool& success, framepos_t position)
                break;
        }
 
-       return 0.0;
+       return Evoral::MusicalTime();
 }
 
 framecnt_t