Fix merge regression: use TempoLines class instead of same built in to editor.

[ardour.git] / libs / ardour / quantize.cc

diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc
index 5da30e846656eae50f652a33986f26a8fe2b98ba..3b5a264a7b84ff77d62c9fca9ab199be9995a0fd 100644 (file)
--- a/libs/ardour/quantize.cc
+++ b/libs/ardour/quantize.cc
@@ -69,102 +69,18 @@ Quantize::run (boost::shared_ptr<Region> r)
 
        double q_frames = _q * (m.frames_per_bar(t, session.frame_rate()) / (double)m.beats_per_bar());
 
-       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);
+       for (Evoral::Sequence::Notes::iterator i = model->notes().begin();
+                       i != model->notes().end(); ++i) {
+               const double new_time = lrint((*i)->time() / q_frames) * q_frames;
+               double new_dur = lrint((*i)->length() / q_frames) * q_frames;
+               if (new_dur == 0.0)
+                       new_dur = q_frames;
                
-               i->set_time(new_time);
-               i->set_duration(new_dur);
+               (*i)->set_time(new_time);
+               (*i)->set_length(new_dur);
        }
 
        model->set_edited(true);
 
        return 0;
-#if 0
-       SourceList nsrcs;
-       SourceList::iterator si;
-       nframes_t blocksize = 256 * 1024;
-       Sample* buf = 0;
-       nframes_t fpos;
-       nframes_t fstart;
-       nframes_t to_read;
-       int ret = -1;
-
-       boost::shared_ptr<AudioRegion> region = boost::dynamic_pointer_cast<AudioRegion>(r);
-       if (!region)
-               return ret;
-
-       /* create new sources */
-
-       if (make_new_sources (region, nsrcs)) {
-               goto out;
-       }
-
-       fstart = region->start();
-
-       if (blocksize > region->length()) {
-               blocksize = region->length();
-       }
-
-       fpos = max (fstart, (fstart + region->length() - blocksize));
-       buf = new Sample[blocksize];
-       to_read = blocksize;
-
-       /* now read it backwards */
-
-       while (to_read) {
-
-               uint32_t n;
-
-               for (n = 0, si = nsrcs.begin(); n < region->n_channels(); ++n, ++si) {
-
-                       /* read it in */
-                       
-                       if (region->audio_source (n)->read (buf, fpos, to_read) != to_read) {
-                               goto out;
-                       }
-
-                       /* swap memory order */
-                       
-                       for (nframes_t i = 0; i < to_read/2; ++i) {
-                               swap (buf[i],buf[to_read-1-i]);
-                       }
-                       
-                       /* write it out */
-
-                       boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si));
-
-                       if (asrc && asrc->write (buf, to_read) != to_read) {
-                               goto out;
-                       }
-               }
-
-               if (fpos > fstart + blocksize) {
-                       fpos -= to_read;
-                       to_read = blocksize;
-               } else {
-                       to_read = fpos - fstart;
-                       fpos = fstart;
-               }
-       };
-
-       ret = finish (region, nsrcs);
-
-  out:
-
-       if (buf) {
-               delete [] buf;
-       }
-
-       if (ret) {
-               for (si = nsrcs.begin(); si != nsrcs.end(); ++si) {
-                       boost::shared_ptr<AudioSource> asrc(boost::dynamic_pointer_cast<AudioSource>(*si));
-                       asrc->mark_for_remove ();
-               }
-       }
-       
-       return ret;
-#endif
 }