diff options
| author | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-02-02 03:57:35 +0000 |
| commit | 9f63ab9931e6478472853bdda58da47ea29ac125 (patch) | |
| tree | 7edfb1d16f580e93501c24fa9f9648fe415f3745 /libs/ardour/quantize.cc | |
| parent | 85ea9028b52eefb34184deb0fbd4d3c7632a2c38 (diff) | |
Merge with trunk R2978.
git-svn-id: svn://localhost/ardour2/branches/3.0@2988 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/quantize.cc')
| -rw-r--r-- | libs/ardour/quantize.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index de3ed4ef22..ccbda9711a 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -71,9 +71,9 @@ Quantize::run (boost::shared_ptr<Region> r) for (MidiModel::Notes::iterator i = model->notes().begin(); i != model->notes().end(); ++i) { const double new_time = lrint((*i)->time() / q_frames) * q_frames; - const double new_dur = (((*i)->time() != 0 && new_dur < (q_frames * 1.5)) - ? q_frames - : lrint((*i)->duration() / q_frames) * q_frames); + double new_dur = lrint((*i)->duration() / q_frames) * q_frames; + if (new_dur == 0.0) + new_dur = q_frames; (*i)->set_time(new_time); (*i)->set_duration(new_dur); |