ardour/livetrax
13
0
Fork 0
Code

non-primary music-locked regions follow tempo changes while dragging.

Browse Source 
- the contents still don't update but position is much
          more wysiwyg.
This commit is contained in:
nick_m 2017-01-31 04:15:21 +11:00
parent d38dc86380
commit 04c484089c
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
gtk2_ardour/editor_drag.cc
View File

@ -928,8 +928,13 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
} }
/* Work out the change in x */ /* Work out the change in x */
TempoMap& tmap = _editor->session()->tempo_map();
MusicFrame pending_region_position (0, 0); MusicFrame pending_region_position (0, 0);
double const x_delta = compute_x_delta (event, &pending_region_position); double const x_delta = compute_x_delta (event, &pending_region_position);
double const last_pos_qn = tmap.exact_qn_at_frame (_last_position.frame, _last_position.division);
double const qn_delta = tmap.exact_qn_at_frame (pending_region_position.frame, pending_region_position.division) - last_pos_qn;
_last_position = pending_region_position; _last_position = pending_region_position;
/* calculate hidden tracks in current y-axis delta */ /* calculate hidden tracks in current y-axis delta */
@ -1173,7 +1178,14 @@ RegionMotionDrag::motion (GdkEvent* event, bool first_move)
} }
/* Now move the region view */ /* Now move the region view */
rv->move (x_delta, y_delta); if (rv->region()->position_lock_style() == MusicTime) {
double const last_qn = tmap.quarter_note_at_frame (rv->get_position());
framepos_t const x_pos_music = tmap.frame_at_quarter_note (last_qn + qn_delta);
rv->set_position (x_pos_music, 0);
} else {
rv->move (x_delta, y_delta);
}
} /* foreach region */ } /* foreach region */