smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-19 05:06:31 +01:00
Code Issues Projects Releases Wiki Activity

mark BBT_Offset (double) constructor explicit to avoid implicit conversion in timeline expressions.

Browse source 
Also clean up the mess this had caused.
This commit is contained in:
Paul Davis 2020-12-01 22:30:04 -07:00
parent b01b6929fb
commit def35cf043
4 changed files with 39 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

4
libs/ardour/smf_source.cc
View file

@ -255,7 +255,7 @@ SMFSource::read_unlocked (const Lock& lock,
_smf_last_read_end = start + duration;
return timecnt_t();
}
time += ev_delta_t; // accumulate delta time
time += timepos_t::from_ticks (ev_delta_t); // accumulate delta time
}
} else {
DEBUG_TRACE (DEBUG::MidiSourceIO, string_compose ("SMF read_unlocked: set time to %1\n", _smf_last_read_time));
@ -272,7 +272,7 @@ SMFSource::read_unlocked (const Lock& lock,
break;
}
time += ev_delta_t; // accumulate delta time
time += timepos_t::from_ticks (ev_delta_t); // accumulate delta time
_smf_last_read_time = time;
if (ret == 0) { // meta-event (skipped, just accumulate time)