diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-09-23 03:39:05 +1000 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-09-23 03:39:05 +1000 |
| commit | 080e7755a614a71e8a2dcd97fb7310fc3401e5ca (patch) | |
| tree | a8bc1cb1515fd4a0cb67f7d592e55bd5a4992f0e /libs/ardour/midi_source.cc | |
| parent | d1d8b1aae723b002c3a2330a78b55245707470b3 (diff) | |
Remove _midi_regions_use_bbt_beats from Session, _start_pulse and _length_pulse from MidiRegion.
- _start/length_beats are now quarter notes regardless
of loaded session version.
- also restores note colour update
Diffstat (limited to 'libs/ardour/midi_source.cc')
| -rw-r--r-- | libs/ardour/midi_source.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/midi_source.cc b/libs/ardour/midi_source.cc index 0982f3dda8..d104fa7949 100644 --- a/libs/ardour/midi_source.cc +++ b/libs/ardour/midi_source.cc @@ -198,12 +198,12 @@ MidiSource::midi_read (const Lock& lm, MidiChannelFilter* filter, const std::set<Evoral::Parameter>& filtered, const double pulse, - const double start_pulse) const + const double start_beats) const { //BeatsFramesConverter converter(_session.tempo_map(), source_start); const int32_t tpb = Timecode::BBT_Time::ticks_per_beat; const double pulse_tick_res = floor ((pulse * 4.0 * tpb) + 0.5) / tpb; - const double start_qn = (pulse - start_pulse) * 4.0; + const double start_qn = (pulse * 4.0) - start_beats; DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("MidiSource::midi_read() %5 sstart %1 start %2 cnt %3 tracker %4\n", |