summaryrefslogtreecommitdiff
path: root/libs/ardour/midi_source.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-10-31 00:01:02 +1100
committernick_m <mainsbridge@gmail.com>2016-11-11 03:37:08 +1100
commitdca96d8b5d6737ec811cf5a46548d39a7912bec8 (patch)
tree3569c1c42a405bc1b43fc22f30d90bba1dc1fe51 /libs/ardour/midi_source.cc
parentac23496b40537d97469acdec89f787f056dc3bba (diff)
rename Region pulse to pos_beats. use new beat distance api where required.
- add more debugging output detecting regions whose beat and frame position do not align on a playlist. this is required as a check as we have never used frame rounding on constant tempi before 8884a5723dc
Diffstat (limited to 'libs/ardour/midi_source.cc')
-rw-r--r--libs/ardour/midi_source.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc
index edfc27acb9..d1a3455ba2 100644
--- a/libs/ardour/midi_source.cc
+++ b/libs/ardour/midi_source.cc
@@ -190,12 +190,12 @@ MidiSource::midi_read (const Lock& lm,
MidiStateTracker* tracker,
MidiChannelFilter* filter,
const std::set<Evoral::Parameter>& filtered,
- const double pulse,
- const double start_beats) const
+ const double pos_beats,
+ const double start_beats) const
{
BeatsFramesConverter converter(_session.tempo_map(), source_start);
- const double start_qn = (pulse * 4.0) - start_beats;
+ const double start_qn = pos_beats - start_beats;
DEBUG_TRACE (DEBUG::MidiSourceIO,
string_compose ("MidiSource::midi_read() %5 sstart %1 start %2 cnt %3 tracker %4\n",