fix a minor conflict after reverting a couple of commits
This commit is contained in:
parent
6cc116e6de
commit
9f52bc05de
|
@ -219,7 +219,7 @@ double
|
|||
MidiClockTicker::one_ppqn_in_samples (samplepos_t transport_position) const
|
||||
{
|
||||
Tempo const & tempo (TempoMap::use()->metric_at (transport_position).tempo());
|
||||
const double samples_per_quarter_note = tempo.samples_per_quarter_note (_session->nominal_sample_rate());
|
||||
const double samples_per_quarter_note = tempo.samples_per_quarter_note (_session.nominal_sample_rate());
|
||||
return samples_per_quarter_note / 24.0;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue
Block a user