diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index aa67bca868..e080d1b8ec 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -39,8 +39,8 @@ using namespace std; using namespace PBD; #include "ardour/audioengine.h" -#define S2SC(s) Temporal::samples_to_superclock (s, AudioEngine::instance()->sample_rate()) -#define SC2S(s) Temporal::superclock_to_samples (s, AudioEngine::instance()->sample_rate()) +#define S2SC(s) Temporal::samples_to_superclock (s, TEMPORAL_SAMPLE_RATE) +#define SC2S(s) Temporal::superclock_to_samples (s, TEMPORAL_SAMPLE_RATE) AudioPlaylist::AudioPlaylist (Session& session, const XMLNode& node, bool hidden) : Playlist (session, node, DataType::AUDIO, hidden) diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index b9b33c93de..e33d13d217 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -70,8 +70,8 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -#define S2SC(s) Temporal::samples_to_superclock (s, AudioEngine::instance()->sample_rate()) -#define SC2S(s) Temporal::superclock_to_samples (s, AudioEngine::instance()->sample_rate()) +#define S2SC(s) Temporal::samples_to_superclock (s, TEMPORAL_SAMPLE_RATE) +#define SC2S(s) Temporal::superclock_to_samples (s, TEMPORAL_SAMPLE_RATE) namespace ARDOUR { namespace Properties { diff --git a/libs/ardour/ltc_slave.cc b/libs/ardour/ltc_slave.cc index d29e96cec0..21968e28d7 100644 --- a/libs/ardour/ltc_slave.cc +++ b/libs/ardour/ltc_slave.cc @@ -151,6 +151,7 @@ ARDOUR::samplecnt_t LTC_TransportMaster::update_interval() const { if (timecode.rate) { + /* Use engine rate, timecode ports are not resampled */ return AudioEngine::instance()->sample_rate() / timecode.rate; } diff --git a/libs/ardour/lv2_plugin.cc b/libs/ardour/lv2_plugin.cc index 5acf0d0eb3..4cef12aee4 100644 --- a/libs/ardour/lv2_plugin.cc +++ b/libs/ardour/lv2_plugin.cc @@ -2747,12 +2747,12 @@ LV2Plugin::connect_and_run(BufferSet& bufs, samplepos_t start0 = std::max (samplepos_t (0), start); TempoMap::SharedPtr tmap (TempoMap::use()); - TempoMetric metric (tmap->metric_at (samples_to_superclock (start0, AudioEngine::instance()->sample_rate()))); + TempoMetric metric (tmap->metric_at (samples_to_superclock (start0, TEMPORAL_SAMPLE_RATE))); TempoMapPoints tempo_map_points; tmap->get_grid (tempo_map_points, - samples_to_superclock (start0, AudioEngine::instance()->sample_rate()), - samples_to_superclock (end, AudioEngine::instance()->sample_rate()), 0); + samples_to_superclock (start0, TEMPORAL_SAMPLE_RATE), + samples_to_superclock (end, TEMPORAL_SAMPLE_RATE), 0); if (_freewheel_control_port) { *_freewheel_control_port = _session.engine().freewheeling() ? 1.f : 0.f; @@ -2890,9 +2890,9 @@ LV2Plugin::connect_and_run(BufferSet& bufs, } } - while (m != m_end || ((tempo_map_point != tempo_map_points.end()) && ((*tempo_map_point).sample(AudioEngine::instance()->sample_rate()) < tend))) { + while (m != m_end || ((tempo_map_point != tempo_map_points.end()) && ((*tempo_map_point).sample(TEMPORAL_SAMPLE_RATE) < tend))) { - if (m != m_end && ((tempo_map_point == tempo_map_points.end()) || (*tempo_map_point).sample(AudioEngine::instance()->sample_rate()) > (*m).time())) { + if (m != m_end && ((tempo_map_point == tempo_map_points.end()) || (*tempo_map_point).sample(TEMPORAL_SAMPLE_RATE) > (*m).time())) { const Evoral::Event ev (*m, false); @@ -2905,7 +2905,7 @@ LV2Plugin::connect_and_run(BufferSet& bufs, } else { assert (tempo_map_point != tempo_map_points.end()); - const samplepos_t sample = tempo_map_point->sample (AudioEngine::instance()->sample_rate()); + const samplepos_t sample = tempo_map_point->sample (TEMPORAL_SAMPLE_RATE); const Temporal::BBT_Time bbt = tempo_map_point->bbt(); double bpm = tempo_map_point->tempo().quarter_notes_per_minute (); diff --git a/libs/ardour/session_vst.cc b/libs/ardour/session_vst.cc index 805d65450e..697a1e3b8c 100644 --- a/libs/ardour/session_vst.cc +++ b/libs/ardour/session_vst.cc @@ -280,7 +280,7 @@ intptr_t Session::vst_callback ( } else { timeinfo->samplePos = 0; - timeinfo->sampleRate = AudioEngine::instance()->sample_rate(); + timeinfo->sampleRate = TEMPORAL_SAMPLE_RATE; } if ((timeinfo->flags & (kVstTransportPlaying | kVstTransportRecording | kVstTransportCycleActive))