projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Reverse parameters to CPPUNIT_ASSERT_EQUAL so its assert
[ardour.git]
/
libs
/
ardour
/
midi_stretch.cc
diff --git
a/libs/ardour/midi_stretch.cc
b/libs/ardour/midi_stretch.cc
index ea5ab62d02517387e8c6a270b093fbc7675ac869..7a4164427a24ba0f7e7a0a530acc9cb41c1ef04c 100644
(file)
--- a/
libs/ardour/midi_stretch.cc
+++ b/
libs/ardour/midi_stretch.cc
@@
-1,6
+1,6
@@
/*
/*
- Copyright (C) 2008 Paul Davis
- Author:
Dave
Robillard
+ Copyright (C) 2008 Paul Davis
+ Author:
David
Robillard
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
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
@@
-20,10
+20,12
@@
#include "pbd/error.h"
#include "pbd/error.h"
-#include "ardour/types.h"
+#include "ardour/midi_model.h"
+#include "ardour/midi_region.h"
+#include "ardour/midi_source.h"
#include "ardour/midi_stretch.h"
#include "ardour/session.h"
#include "ardour/midi_stretch.h"
#include "ardour/session.h"
-#include "ardour/
midi_region
.h"
+#include "ardour/
types
.h"
#include "i18n.h"
#include "i18n.h"
@@
-42,7
+44,7
@@
MidiStretch::~MidiStretch ()
}
int
}
int
-MidiStretch::run (boost::shared_ptr<Region> r)
+MidiStretch::run (boost::shared_ptr<Region> r
, Progress*
)
{
SourceList nsrcs;
char suffix[32];
{
SourceList nsrcs;
char suffix[32];
@@
-54,9
+56,9
@@
MidiStretch::run (boost::shared_ptr<Region> r)
/* the name doesn't need to be super-precise, but allow for 2 fractional
digits just to disambiguate close but not identical stretches.
*/
/* the name doesn't need to be super-precise, but allow for 2 fractional
digits just to disambiguate close but not identical stretches.
*/
-
+
snprintf (suffix, sizeof (suffix), "@%d", (int) floor (_request.time_fraction * 100.0f));
snprintf (suffix, sizeof (suffix), "@%d", (int) floor (_request.time_fraction * 100.0f));
-
+
string new_name = region->name();
string::size_type at = new_name.find ('@');
string new_name = region->name();
string::size_type at = new_name.find ('@');
@@
-67,15
+69,15
@@
MidiStretch::run (boost::shared_ptr<Region> r)
}
new_name += suffix;
}
new_name += suffix;
-
+
/* create new sources */
/* create new sources */
-
+
if (make_new_sources (region, nsrcs, suffix))
return -1;
// FIXME: how to make a whole file region if it isn't?
//assert(region->whole_file());
if (make_new_sources (region, nsrcs, suffix))
return -1;
// FIXME: how to make a whole file region if it isn't?
//assert(region->whole_file());
-
+
boost::shared_ptr<MidiSource> src = region->midi_source(0);
src->load_model();
boost::shared_ptr<MidiSource> src = region->midi_source(0);
src->load_model();
@@
-84,26
+86,33
@@
MidiStretch::run (boost::shared_ptr<Region> r)
boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
assert(new_src);
boost::shared_ptr<MidiSource> new_src = boost::dynamic_pointer_cast<MidiSource>(nsrcs[0]);
assert(new_src);
- new_src->load_model(true, true);
+ Glib::Mutex::Lock sl (new_src->mutex ());
+
+ new_src->load_model(false, true);
boost::shared_ptr<MidiModel> new_model = new_src->model();
new_model->start_write();
boost::shared_ptr<MidiModel> new_model = new_src->model();
new_model->start_write();
-
- for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = old_model->begin();
+
+ /* Note: pass true into force_discrete for the begin() iterator so that the model doesn't
+ * do interpolation of controller data when we stretch.
+ */
+ for (Evoral::Sequence<MidiModel::TimeType>::const_iterator i = old_model->begin (0, true);
i != old_model->end(); ++i) {
const double new_time = i->time() * _request.time_fraction;
i != old_model->end(); ++i) {
const double new_time = i->time() * _request.time_fraction;
-
+
// FIXME: double copy
Evoral::Event<MidiModel::TimeType> ev(*i, true);
// FIXME: double copy
Evoral::Event<MidiModel::TimeType> ev(*i, true);
- ev.
time() = new_time
;
- new_model->append(ev);
+ ev.
set_time(new_time)
;
+ new_model->append(ev
, Evoral::next_event_id()
);
}
}
- new_model->end_write();
- new_model->set_edited(true);
-
+ new_model->end_write (Evoral::Sequence<Evoral::MusicalTime>::DeleteStuckNotes);
+ new_model->set_edited (true);
+
+ new_src->copy_interpolation_from (src);
+
const int ret = finish (region, nsrcs, new_name);
const int ret = finish (region, nsrcs, new_name);
-
- results[0]->set_length((
nframes_t) floor (r->length() * _request.time_fraction), NULL
);
+
+ results[0]->set_length((
framecnt_t) floor (r->length() * _request.time_fraction)
);
return ret;
}
return ret;
}