Mercurial > hg > svcore
comparison plugin/plugins/SamplePlayer.cpp @ 1206:659372323b45 tony-2.0-integration
Merge latest SV 3.0 branch code
| author | Chris Cannam |
|---|---|
| date | Fri, 19 Aug 2016 15:58:57 +0100 |
| parents | 63b73a21bccd |
| children | 1c9bbbb6116a |
comparison
equal
deleted
inserted
replaced
| 1136:e94719f941ba | 1206:659372323b45 |
|---|---|
| 569 | 569 |
| 570 if (m_retune && *m_retune) { | 570 if (m_retune && *m_retune) { |
| 571 if (m_concertA) { | 571 if (m_concertA) { |
| 572 ratio *= *m_concertA / 440.f; | 572 ratio *= *m_concertA / 440.f; |
| 573 } | 573 } |
| 574 if (m_basePitch && n != *m_basePitch) { | 574 if (m_basePitch && float(n) != *m_basePitch) { |
| 575 ratio *= powf(1.059463094f, float(n) - *m_basePitch); | 575 ratio *= powf(1.059463094f, float(n) - *m_basePitch); |
| 576 } | 576 } |
| 577 } | 577 } |
| 578 | 578 |
| 579 if (long(pos + m_sampleNo) < m_ons[n]) return; | 579 if (long(pos + m_sampleNo) < m_ons[n]) return; |