projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
implement lv2:designation processing#enable (for bypass ports)
[ardour.git]
/
libs
/
ardour
/
session_vst.cc
diff --git
a/libs/ardour/session_vst.cc
b/libs/ardour/session_vst.cc
index 21875ece4654c41b6b194f023248bb831a2958ca..4cce5219ac11248a95e7ba637170764752dcdc61 100644
(file)
--- a/
libs/ardour/session_vst.cc
+++ b/
libs/ardour/session_vst.cc
@@
-200,8
+200,8
@@
intptr_t Session::vst_callback (
timeinfo->nanoSeconds = g_get_monotonic_time () * 1000;
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();
timeinfo->samplePos = now;
timeinfo->sampleRate = session->frame_rate();
@@
-223,7
+223,8
@@
intptr_t Session::vst_callback (
Timecode::BBT_Time bbt;
try {
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);
double ppqBar;
double ppqPos = vst_ppq (tm, bbt, ppqBar);
@@
-279,7
+280,7
@@
intptr_t Session::vst_callback (
newflags |= kVstTransportRecording;
}
newflags |= kVstTransportRecording;
}
- if (
session
->transport_speed () != 0.0f) {
+ if (
plug
->transport_speed () != 0.0f) {
newflags |= kVstTransportPlaying;
}
newflags |= kVstTransportPlaying;
}
@@
-290,10
+291,10
@@
intptr_t Session::vst_callback (
double ppqBar;
Timecode::BBT_Time bbt;
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);
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;
timeinfo->cycleEndPos = vst_ppq (tm, bbt, ppqBar);
newflags |= kVstCyclePosValid;
@@
-337,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) {
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;
return t.beats_per_minute() * 1000;
} else {
return 0;
@@
-548,4
+549,3
@@
intptr_t Session::vst_callback (
return 0;
}
return 0;
}
-