X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession_vst.cc;h=a614fef956dae893586f41cad414f24a57b077eb;hb=d92686afb4105b84b014372b6feb0ccc454a5171;hp=7b52b3cdf49b868073574ac5c70df6228e6fc7e0;hpb=cf52d6e4b40111eb04b244ec054055a4ec15dbe0;p=ardour.git

diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc
index 7b52b3cdf4..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 (tm.tempo());
+				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 (...) { }