Merge some cases to avoid duplicated logic

[ardour.git] / libs / ardour / session_vst.cc

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 23cf0f8b001fa96edf9117907cf726ea2e720d91..7b52b3cdf49b868073574ac5c70df6228e6fc7e0 100644 (file)
--- a/libs/ardour/session_vst.cc
+++ b/libs/ardour/session_vst.cc
@@ -34,7 +34,7 @@
 #include <fst.h>
 #endif
 
-#include "i18n.h"
+#include "pbd/i18n.h"
 
 using namespace ARDOUR;
 
@@ -64,6 +64,7 @@ vst_ppq (const TempoMetric& tm, const Timecode::BBT_Time& bbt, double& ppqBar)
 
        ppqBar *= ppq_scaling;
        ppqBeat *= ppq_scaling;
+       ppqTick *= ppq_scaling;
 
        return ppqBar + ppqBeat + ppqTick;
 }
@@ -199,8 +200,8 @@ intptr_t Session::vst_callback (
 
                timeinfo->nanoSeconds = g_get_monotonic_time () * 1000;
 
-               if (session) {
-                       framepos_t now = session->transport_frame();
+               if (plug && session) {
+                       framepos_t now = plug->transport_frame();
 
                        timeinfo->samplePos = now;
                        timeinfo->sampleRate = session->frame_rate();
@@ -222,7 +223,8 @@ intptr_t Session::vst_callback (
                                Timecode::BBT_Time bbt;
 
                                try {
-                                       session->tempo_map().bbt_time_rt (now, bbt);
+                                       bbt = session->tempo_map().bbt_at_frame_rt (now);
+
                                        double ppqBar;
                                        double ppqPos = vst_ppq (tm, bbt, ppqBar);
 
@@ -278,7 +280,7 @@ intptr_t Session::vst_callback (
                                newflags |= kVstTransportRecording;
                        }
 
-                       if (session->transport_speed () != 0.0f) {
+                       if (plug->transport_speed () != 0.0f) {
                                newflags |= kVstTransportPlaying;
                        }
 
@@ -289,10 +291,10 @@ intptr_t Session::vst_callback (
                                        double ppqBar;
                                        Timecode::BBT_Time bbt;
 
-                                       session->tempo_map().bbt_time_rt (looploc->start (), bbt);
+                                       bbt = session->tempo_map ().bbt_at_frame_rt (looploc->start ());
                                        timeinfo->cycleStartPos = vst_ppq (tm, bbt, ppqBar);
 
-                                       session->tempo_map().bbt_time_rt (looploc->end (), bbt);
+                                       bbt = session->tempo_map ().bbt_at_frame_rt (looploc->end ());
                                        timeinfo->cycleEndPos = vst_ppq (tm, bbt, ppqBar);
 
                                        newflags |= kVstCyclePosValid;
@@ -336,7 +338,7 @@ intptr_t Session::vst_callback (
                SHOW_CALLBACK ("audioMasterTempoAt");
                // returns tempo (in bpm * 10000) at sample frame location passed in <value>
                if (session) {
-                       const Tempo& t (session->tempo_map().tempo_at (value));
+                       const Tempo& t (session->tempo_map().tempo_at_frame (value));
                        return t.beats_per_minute() * 1000;
                } else {
                        return 0;
@@ -547,4 +549,3 @@ intptr_t Session::vst_callback (
 
        return 0;
 }
-