ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

manually reverse 948500bbc7 (final code is not identical to previous state)

Browse Source
This commit is contained in:
Paul Davis 2021-10-27 08:36:52 -06:00
parent 66fe6e937a
commit e1c874b299
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/midi_region.h
View File

@ -114,7 +114,6 @@ class LIBARDOUR_API MidiRegion : public Region
NoteMode mode,
timepos_t const & read_start,
timecnt_t const & read_length,
timepos_t const & source_position,
MidiChannelFilter* filter) const;
protected:

7
libs/ardour/midi_region.cc
View File

@ -283,7 +283,7 @@ MidiRegion::render (Evoral::EventSink<samplepos_t>& dst,
NoteMode mode,
MidiChannelFilter* filter) const
{
return render_range (dst, chan_n, mode, this->start(), _length, source_position(), filter);
return render_range (dst, chan_n, mode, this->start(), _length, filter);
}
int
@ -292,7 +292,6 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
NoteMode mode,
timepos_t const & read_start,
timecnt_t const & read_length,
timepos_t const & source_position,
MidiChannelFilter* filter) const
{
/* precondition: caller has verified that we cover the desired section */
@ -328,7 +327,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
src->midi_read (
lm, // source lock
dst, // destination buffer
source_position, // start position of the source in session samples
source_position(), // start position of the source in session samples
read_start,
read_length,
0,
@ -341,7 +340,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
* Note-Off's get inserted at the end of the region
*/
const timepos_t end = source_position + read_start + read_length;
const timepos_t end = source_position() + read_start + read_length;
tracker.resolve_notes (dst, end.samples());
return 0;

3
libs/ardour/triggerbox.cc
View File

@ -1181,7 +1181,8 @@ int
MIDITrigger::load_data (boost::shared_ptr<MidiRegion> mr)
{
drop_data ();
mr->render_range (data, 0, Sustained, mr->start(), mr->length(), timepos_t (Temporal::BeatTime), 0);
mr->render_range (data, 0, Sustained, mr->start(), mr->length(), 0);
set_name (mr->name());
data_length = data.span();
DEBUG_TRACE (DEBUG::Triggers, string_compose ("%1 loaded midi region, span is %2\n", name(), data_length));