X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fquantize.cc;h=97be158badd853bdc5dfde5d07952b025988897a;hb=54cbc45a5a40f4eefd64fa41ad9029f5f8f6a84f;hp=5da30e846656eae50f652a33986f26a8fe2b98ba;hpb=f9a7388d7aa62c6b8ab0bc8c62bf53ae1652e8e1;p=ardour.git diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index 5da30e8466..97be158bad 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 Paul Davis This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -16,30 +16,42 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. */ +#include -#include +#include "pbd/basename.h" -#include -#include -#include -#include -#include -#include +#include "ardour/types.h" +#include "ardour/quantize.h" +#include "ardour/session.h" +#include "ardour/smf_source.h" +#include "ardour/midi_model.h" +#include "ardour/midi_region.h" +#include "ardour/tempo.h" #include "i18n.h" using namespace std; +using namespace PBD; using namespace ARDOUR; - -/** Quantize notes, valid for MIDI regions only. +/** Quantize notes * - * Q is the quantize value in beats, ie 1.0 = quantize to beats, + * grid parameters are the quantize value in beats, ie 1.0 = quantize to beats, * 0.25 = quantize to beats/4, etc. */ -Quantize::Quantize (Session& s, double q) - : Filter (s) - , _q(q) + +Quantize::Quantize (Session& s, QuantizeType /* type */, + bool snap_start, bool snap_end, + double start_grid, double end_grid, + float strength, float swing, float threshold) + : session (s) + , _snap_start (snap_start) + , _snap_end (snap_end) + , _start_grid(start_grid) + , _end_grid(end_grid) + , _strength (strength/100.0) + , _swing (swing/100.0) + , _threshold (threshold) { } @@ -47,124 +59,71 @@ Quantize::~Quantize () { } -int -Quantize::run (boost::shared_ptr r) +Command* +Quantize::operator () (boost::shared_ptr model, std::vector::Notes>& seqs) { - boost::shared_ptr region = boost::dynamic_pointer_cast(r); - if (!region) - return -1; - - // FIXME: how to make a whole file region if it isn't? - //assert(region->whole_file()); - - boost::shared_ptr src = region->midi_source(0); - src->load_model(); - - boost::shared_ptr model = src->model(); - - // FIXME: Model really needs to be switched to beat time (double) ASAP - - const Tempo& t = session.tempo_map().tempo_at(r->start()); - const Meter& m = session.tempo_map().meter_at(r->start()); - - 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); - - i->set_time(new_time); - i->set_duration(new_dur); - } + bool even; + MidiModel::DiffCommand* cmd = new MidiModel::DiffCommand (model, "quantize"); - model->set_edited(true); + for (std::vector::Notes>::iterator s = seqs.begin(); s != seqs.end(); ++s) { - 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; + even = false; - boost::shared_ptr region = boost::dynamic_pointer_cast(r); - if (!region) - return ret; + for (Evoral::Sequence::Notes::iterator i = (*s).begin(); i != (*s).end(); ++i) { - /* create new sources */ + double new_start = round ((*i)->time() / _start_grid) * _start_grid; + double new_end = round ((*i)->end_time() / _end_grid) * _end_grid; + double delta; - if (make_new_sources (region, nsrcs)) { - goto out; - } - - fstart = region->start(); + if (_swing > 0.0 && !even) { - if (blocksize > region->length()) { - blocksize = region->length(); - } + double next_grid = new_start + _start_grid; - fpos = max (fstart, (fstart + region->length() - blocksize)); - buf = new Sample[blocksize]; - to_read = blocksize; + /* find a spot 2/3 (* swing factor) of the way between the grid point + we would put this note at, and the nominal position of the next note. + */ - /* now read it backwards */ + new_start = new_start + (2.0/3.0 * _swing * (next_grid - new_start)); - while (to_read) { + } else if (_swing < 0.0 && !even) { - uint32_t n; + double prev_grid = new_start - _start_grid; - for (n = 0, si = nsrcs.begin(); n < region->n_channels(); ++n, ++si) { + /* find a spot 2/3 (* swing factor) of the way between the grid point + we would put this note at, and the nominal position of the previous note. + */ - /* read it in */ - - if (region->audio_source (n)->read (buf, fpos, to_read) != to_read) { - goto out; - } + new_start = new_start - (2.0/3.0 * _swing * (new_start - prev_grid)); - /* 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 asrc(boost::dynamic_pointer_cast(*si)); + delta = new_start - (*i)->time(); - if (asrc && asrc->write (buf, to_read) != to_read) { - goto out; + if (fabs (delta) >= _threshold) { + if (_snap_start) { + delta *= _strength; + cmd->change ((*i), MidiModel::DiffCommand::StartTime, + (*i)->time() + delta); + } } - } - if (fpos > fstart + blocksize) { - fpos -= to_read; - to_read = blocksize; - } else { - to_read = fpos - fstart; - fpos = fstart; - } - }; + if (_snap_end) { + delta = new_end - (*i)->end_time(); - ret = finish (region, nsrcs); + if (fabs (delta) >= _threshold) { + double new_dur = new_end - new_start; - out: + if (new_dur == 0.0) { + new_dur = _end_grid; + } - if (buf) { - delete [] buf; - } + cmd->change ((*i), MidiModel::DiffCommand::Length, new_dur); + } + } - if (ret) { - for (si = nsrcs.begin(); si != nsrcs.end(); ++si) { - boost::shared_ptr asrc(boost::dynamic_pointer_cast(*si)); - asrc->mark_for_remove (); + even = !even; } } - - return ret; -#endif + + return cmd; }