diff --git a/gtk2_ardour/audio_clip_editor.cc b/gtk2_ardour/audio_clip_editor.cc index fe7220e9e3..7f4e60ade2 100644 --- a/gtk2_ardour/audio_clip_editor.cc +++ b/gtk2_ardour/audio_clip_editor.cc @@ -105,7 +105,7 @@ AudioClipEditor::ClipBBTMetric::get_marks (std::vectortempo_at (samples_to_superclock (_tempo->sample (sr) - 1, sr)).end_note_types_per_minute() << "\n"; } @@ -3795,7 +3795,7 @@ TempoEndDrag::motion (GdkEvent* event, bool first_move) _editor->mid_tempo_change (Editor::TempoChanged); ostringstream sstr; - const samplecnt_t sr = AudioEngine::instance()->sample_rate(); + const samplecnt_t sr = _editor->session()->sample_rate(); sstr << "end: " << fixed << setprecision(3) << map->tempo_at (samples_to_superclock (_tempo->sample (sr) - 1, sr)).end_note_types_per_minute() << "\n"; if (_tempo->continuing()) { diff --git a/gtk2_ardour/recorder_ui.cc b/gtk2_ardour/recorder_ui.cc index cbee56d0b1..f970a4b864 100644 --- a/gtk2_ardour/recorder_ui.cc +++ b/gtk2_ardour/recorder_ui.cc @@ -1385,7 +1385,7 @@ Glib::RefPtr RecorderUI::InputPort::_monitor_size_group; RecorderUI::InputPort::InputPort (string const& name, DataType dt, RecorderUI* parent, bool vertical, bool ioplug) : _dt (dt) - , _monitor (dt, AudioEngine::instance()->sample_rate (), vertical ? InputPortMonitor::Vertical : InputPortMonitor::Horizontal) + , _monitor (dt, TEMPORAL_SAMPLE_RATE, vertical ? InputPortMonitor::Vertical : InputPortMonitor::Horizontal) // XXX , _alignment (0.5, 0.5, 0, 0) , _frame (vertical ? ArdourWidgets::Frame::Vertical : ArdourWidgets::Frame::Horizontal) , _spill_button ("", ArdourButton::default_elements, true) diff --git a/gtk2_ardour/transport_masters_dialog.cc b/gtk2_ardour/transport_masters_dialog.cc index ef37e3cac4..62b1c781dc 100644 --- a/gtk2_ardour/transport_masters_dialog.cc +++ b/gtk2_ardour/transport_masters_dialog.cc @@ -578,7 +578,7 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) sample_to_timecode (pos, t, false, false, Timecode::timecode_to_frames_per_second (fmt), Timecode::timecode_has_drop_frames (fmt), - AudioEngine::instance()->sample_rate(), 0, false, 0); + TEMPORAL_SAMPLE_RATE, 0, false, 0); } else if ((mtm = boost::dynamic_pointer_cast (tm))) { char buf[16]; @@ -602,7 +602,7 @@ TransportMastersWidget::Row::update (Session* s, samplepos_t now) if (save_when) { char gap[32]; - float seconds = (now - save_when) / (float) AudioEngine::instance()->sample_rate(); + float seconds = (now - save_when) / (float) TEMPORAL_SAMPLE_RATE; if (seconds < 0) { seconds = 0; }