summaryrefslogtreecommitdiff
path: root/libs/ardour/session_vst.cc
diff options
context:
space:
mode:
authornick_m <mainsbridge@gmail.com>2016-08-18 05:39:44 +1000
committernick_m <mainsbridge@gmail.com>2016-08-18 05:39:44 +1000
commit6d0208613db9dc6d93559392d227fa1a600d0030 (patch)
treebb6083a93081dc55294813bdf32ca0e63d55b60c /libs/ardour/session_vst.cc
parentb243af48c756813eda6af6f519e138447591cbde (diff)
Use quarter pulses (quarter notes) for VST's ppqBar, ppqPos and cycleStart/EndPos.
Diffstat (limited to 'libs/ardour/session_vst.cc')
-rw-r--r--libs/ardour/session_vst.cc28
1 files changed, 11 insertions, 17 deletions
diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 2a31592076..a614fef956 100644
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -206,17 +206,15 @@ intptr_t Session::vst_callback (
timeinfo->samplePos = now;
timeinfo->sampleRate = session->frame_rate();
- const TempoMetric& tm (session->tempo_map().metric_at (now));
-
if (value & (kVstTempoValid)) {
const Tempo& t (session->tempo_map().tempo_at_frame (now));
timeinfo->tempo = t.beats_per_minute ();
newflags |= (kVstTempoValid);
}
if (value & (kVstTimeSigValid)) {
- const Meter& m (tm.meter());
- timeinfo->timeSigNumerator = m.divisions_per_bar ();
- timeinfo->timeSigDenominator = m.note_divisor ();
+ const MeterSection& ms (session->tempo_map().meter_section_at_frame (now));
+ timeinfo->timeSigNumerator = ms.divisions_per_bar ();
+ timeinfo->timeSigDenominator = ms.note_divisor ();
newflags |= (kVstTimeSigValid);
}
if ((value & (kVstPpqPosValid)) || (value & (kVstBarsValid))) {
@@ -224,10 +222,12 @@ intptr_t Session::vst_callback (
try {
bbt = session->tempo_map().bbt_at_frame_rt (now);
-
- double ppqBar;
- double ppqPos = vst_ppq (tm, bbt, ppqBar);
-
+ bbt.beats = 1;
+ bbt.ticks = 0;
+ /* exact quarter note */
+ double ppqBar = session->tempo_map().pulse_at_bbt_rt (bbt) * 4.0;
+ /* quarter note at frame position (not rounded to note subdivision) */
+ double ppqPos = session->tempo_map().quarter_note_at_frame_rt (now);
if (value & (kVstPpqPosValid)) {
timeinfo->ppqPos = ppqPos;
newflags |= kVstPpqPosValid;
@@ -288,14 +288,8 @@ intptr_t Session::vst_callback (
newflags |= kVstTransportCycleActive;
Location * looploc = session->locations ()->auto_loop_location ();
if (looploc) try {
- double ppqBar;
- Timecode::BBT_Time bbt;
-
- bbt = session->tempo_map ().bbt_at_frame_rt (looploc->start ());
- timeinfo->cycleStartPos = vst_ppq (tm, bbt, ppqBar);
-
- bbt = session->tempo_map ().bbt_at_frame_rt (looploc->end ());
- timeinfo->cycleEndPos = vst_ppq (tm, bbt, ppqBar);
+ timeinfo->cycleStartPos = session->tempo_map ().quarter_note_at_frame_rt (looploc->start ());
+ timeinfo->cycleEndPos = session->tempo_map ().quarter_note_at_frame_rt (looploc->end ());
newflags |= kVstCyclePosValid;
} catch (...) { }