projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into saveas
[ardour.git]
/
libs
/
ardour
/
quantize.cc
diff --git
a/libs/ardour/quantize.cc
b/libs/ardour/quantize.cc
index 7da1edaaa18732695a64ab7d678f9e3f5ce917ac..66044690077d3ad3fbc517188881a573768adeca 100644
(file)
--- a/
libs/ardour/quantize.cc
+++ b/
libs/ardour/quantize.cc
@@
-35,11
+35,10
@@
using namespace ARDOUR;
* 0.25 = quantize to beats/4, etc.
*/
* 0.25 = quantize to beats/4, etc.
*/
-Quantize::Quantize (
Session& s,
bool snap_start, bool snap_end,
+Quantize::Quantize (bool snap_start, bool snap_end,
double start_grid, double end_grid,
float strength, float swing, float threshold)
double start_grid, double end_grid,
float strength, float swing, float threshold)
- : session (s)
- , _snap_start (snap_start)
+ : _snap_start (snap_start)
, _snap_end (snap_end)
, _start_grid(start_grid)
, _end_grid(end_grid)
, _snap_end (snap_end)
, _start_grid(start_grid)
, _end_grid(end_grid)
@@
-55,20
+54,22
@@
Quantize::~Quantize ()
Command*
Quantize::operator () (boost::shared_ptr<MidiModel> model,
Command*
Quantize::operator () (boost::shared_ptr<MidiModel> model,
-
double
position,
- std::vector<Evoral::Sequence<Evoral::
MusicalTime
>::Notes>& seqs)
+
Evoral::Beats
position,
+ std::vector<Evoral::Sequence<Evoral::
Beats
>::Notes>& seqs)
{
{
+ /* TODO: Rewrite this to be precise with fixed point? */
+
/* Calculate offset from start of model to next closest quantize step,
to quantize relative to actual session beats (etc.) rather than from the
start of the model.
*/
/* Calculate offset from start of model to next closest quantize step,
to quantize relative to actual session beats (etc.) rather than from the
start of the model.
*/
- const double round_pos = round(position / _start_grid) * _start_grid;
- const double offset = round_pos - position;
+ const double round_pos = round(position
.to_double()
/ _start_grid) * _start_grid;
+ const double offset = round_pos - position
.to_double()
;
bool even;
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
bool even;
MidiModel::NoteDiffCommand* cmd = new MidiModel::NoteDiffCommand (model, "quantize");
- for (std::vector<Evoral::Sequence<Evoral::
MusicalTime
>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
+ for (std::vector<Evoral::Sequence<Evoral::
Beats
>::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) {
even = false;
even = false;
@@
-77,8
+78,8
@@
Quantize::operator () (boost::shared_ptr<MidiModel> model,
*/
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_end = round (((*i)->end_time() - offset) / _end_grid) * _end_grid + offset;
+ double new_start = round (((*i)->time()
.to_double()
- offset) / _start_grid) * _start_grid + offset;
+ double new_end = round (((*i)->end_time()
.to_double()
- offset) / _end_grid) * _end_grid + offset;
if (_swing > 0.0 && !even) {
if (_swing > 0.0 && !even) {
@@
-104,24
+105,24
@@
Quantize::operator () (boost::shared_ptr<MidiModel> model,
}
}
- double delta = new_start - (*i)->time();
+ double delta = new_start - (*i)->time()
.to_double()
;
if (fabs (delta) >= _threshold) {
if (_snap_start) {
delta *= _strength;
cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
if (fabs (delta) >= _threshold) {
if (_snap_start) {
delta *= _strength;
cmd->change ((*i), MidiModel::NoteDiffCommand::StartTime,
- (*i)->time() + delta);
+ (*i)->time() + delta);
}
}
if (_snap_end) {
}
}
if (_snap_end) {
- delta = new_end - (*i)->end_time();
+ delta = new_end - (*i)->end_time()
.to_double()
;
if (fabs (delta) >= _threshold) {
if (fabs (delta) >= _threshold) {
-
double new_dur = new_end - new_start
;
+
Evoral::Beats new_dur(new_end - new_start)
;
- if (
new_dur == 0.0
) {
- new_dur =
_end_grid
;
+ if (
!new_dur
) {
+ new_dur =
Evoral::Beats(_end_grid)
;
}
cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);
}
cmd->change ((*i), MidiModel::NoteDiffCommand::Length, new_dur);