mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-12 17:46:34 +01:00
Fix midi-note length when quantizing a swing rhythm
Note: 'swing' probably requires a 2nd iteration: first quantize notes to the grid, then apply beat shift.
This commit is contained in:
parent
be69bf15dd
commit
20c20b7ddf
1 changed files with 5 additions and 0 deletions
|
|
@ -72,6 +72,9 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
|
||||||
|
|
||||||
even = false;
|
even = false;
|
||||||
|
|
||||||
|
/* TODO 'swing' probably requires a 2nd iteration:
|
||||||
|
* first quantize notes to the grid, then apply beat shift
|
||||||
|
*/
|
||||||
for (Evoral::Sequence<MidiModel::TimeType>::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) {
|
for (Evoral::Sequence<MidiModel::TimeType>::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) {
|
||||||
|
|
||||||
double new_start = round (((*i)->time() - offset) / _start_grid) * _start_grid + offset;
|
double new_start = round (((*i)->time() - offset) / _start_grid) * _start_grid + offset;
|
||||||
|
|
@ -86,6 +89,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
new_start = new_start + (2.0/3.0 * _swing * (next_grid - new_start));
|
new_start = new_start + (2.0/3.0 * _swing * (next_grid - new_start));
|
||||||
|
new_end = new_end + (2.0/3.0 * _swing * (next_grid - new_start));
|
||||||
|
|
||||||
} else if (_swing < 0.0 && !even) {
|
} else if (_swing < 0.0 && !even) {
|
||||||
|
|
||||||
|
|
@ -96,6 +100,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model,
|
||||||
*/
|
*/
|
||||||
|
|
||||||
new_start = new_start - (2.0/3.0 * _swing * (new_start - prev_grid));
|
new_start = new_start - (2.0/3.0 * _swing * (new_start - prev_grid));
|
||||||
|
new_end = new_end - (2.0/3.0 * _swing * (new_start - prev_grid));
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue