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

midiregion: remove internal_offset local variable

Browse Source 
Even in 6.9, the logic of this conditional would always generate an
internal_offset value of zero samples.
This commit is contained in:
Paul Davis 2021-10-25 13:55:03 -06:00
parent 54f5c65f02
commit 787e5a2ea8
1 changed files with 2 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
libs/ardour/midi_region.cc
View File

@ -294,8 +294,6 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
timecnt_t const & read_length, timecnt_t const & read_length,
MidiChannelFilter* filter) const MidiChannelFilter* filter) const
{ {
timecnt_t internal_offset;
/* precondition: caller has verified that we cover the desired section */ /* precondition: caller has verified that we cover the desired section */
assert(chan_n == 0); assert(chan_n == 0);
@ -304,22 +302,6 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
return 0; /* read nothing */ return 0; /* read nothing */
} }
/* render() pulls from zero to infinity ... */
if (!position().zero()) {
/* we are starting the read from before the start of the region */
internal_offset = timecnt_t (Temporal::BeatTime);
} else {
/* we are starting the read from after the start of the region */
internal_offset = timecnt_t (-position());
}
cerr << "RENDER , iffoset " << internal_offset << endl;
if (internal_offset >= _length) {
return 0; /* read nothing */
}
boost::shared_ptr<MidiSource> src = midi_source(chan_n); boost::shared_ptr<MidiSource> src = midi_source(chan_n);
Glib::Threads::Mutex::Lock lm(src->mutex()); Glib::Threads::Mutex::Lock lm(src->mutex());
@ -330,11 +312,9 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
cerr << "MR " << name () << " render " cerr << "MR " << name () << " render "
<< " _position = " << _position << " _position = " << _position
<< " _start = " << _start << " _start = " << _start
<< " intoffset = " << internal_offset
<< " quarter_note = " << quarter_note() << " quarter_note = " << quarter_note()
<< " start_beat = " << _start_beats << " start_beat = " << _start_beats
<< " a1 " << _position - _start << " a1 " << _position - _start
<< " a2 " << _start + internal_offset
<< " a3 " << _length << " a3 " << _length
<< endl; << endl;
#endif #endif
@ -348,7 +328,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
lm, // source lock lm, // source lock
dst, // destination buffer dst, // destination buffer
this->source_position(), // start position of the source in session samples this->source_position(), // start position of the source in session samples
read_start + internal_offset, read_start,
read_length, read_length,
0, 0,
cursor, cursor,
@ -360,7 +340,7 @@ MidiRegion::render_range (Evoral::EventSink<samplepos_t>& dst,
* Note-Off's get inserted at the end of the region * Note-Off's get inserted at the end of the region
*/ */
const timepos_t end = source_position() + read_start + internal_offset + read_length; const timepos_t end = source_position() + read_start + read_length;
tracker.resolve_notes (dst, end.samples()); tracker.resolve_notes (dst, end.samples());
return 0; return 0;