From 8f3bc6f8099d7fc3bcc7f0dc88434afa0084e35f Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 27 May 2016 01:25:47 +1000 Subject: Tempo ramps - rename tempo_at() -> tempo_at_frame().. 3 decimals for the audioclock tempo display. --- gtk2_ardour/audio_clock.cc | 2 +- gtk2_ardour/automation_controller.cc | 2 +- gtk2_ardour/automation_line.cc | 4 ++-- gtk2_ardour/editor_drag.cc | 4 ++-- gtk2_ardour/editor_tempodisplay.cc | 2 +- gtk2_ardour/step_editor.cc | 2 +- gtk2_ardour/tempo_dialog.cc | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index e7aff0ef13..7cdf66123d 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1287,7 +1287,7 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/) TempoMetric m (_session->tempo_map().metric_at (pos)); - sprintf (buf, "%-5.1f", _session->tempo_map().tempo_at (pos).beats_per_minute()); + sprintf (buf, "%-5.3f", _session->tempo_map().tempo_at_frame (pos).beats_per_minute()); _left_layout->set_markup (string_compose ("" TXTSPAN "%3 %2", INFO_FONT_SIZE, buf, _("Tempo"))); diff --git a/gtk2_ardour/automation_controller.cc b/gtk2_ardour/automation_controller.cc index b598f44f94..66c051ee19 100644 --- a/gtk2_ardour/automation_controller.cc +++ b/gtk2_ardour/automation_controller.cc @@ -261,7 +261,7 @@ AutomationController::set_freq_beats(double beats) const ARDOUR::ParameterDescriptor& desc = _controllable->desc(); const ARDOUR::Session& session = _controllable->session(); const framepos_t pos = session.transport_frame(); - const ARDOUR::Tempo& tempo = session.tempo_map().tempo_at(pos); + const ARDOUR::Tempo& tempo = session.tempo_map().tempo_at_frame (pos); const double bpm = tempo.beats_per_minute(); const double bps = bpm / 60.0; const double freq = bps / beats; diff --git a/gtk2_ardour/automation_line.cc b/gtk2_ardour/automation_line.cc index 2094d43eff..47e91021ae 100644 --- a/gtk2_ardour/automation_line.cc +++ b/gtk2_ardour/automation_line.cc @@ -547,7 +547,7 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) const framepos_t pos = e.pixel_to_sample(before_x); const Meter& meter = map.meter_at (pos); - const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at_frame (pos), e.session()->frame_rate()) / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar()) ); const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); @@ -563,7 +563,7 @@ AutomationLine::ContiguousControlPoints::compute_x_bounds (PublicEditor& e) const framepos_t pos = e.pixel_to_sample(after_x); const Meter& meter = map.meter_at (pos); - const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at (pos), e.session()->frame_rate()) + const framecnt_t len = ceil (meter.frames_per_bar (map.tempo_at_frame (pos), e.session()->frame_rate()) / (Timecode::BBT_Time::ticks_per_beat * meter.divisions_per_bar())); const double one_tick_in_pixels = e.sample_to_pixel_unrounded (len); diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 9547a0f574..07b2eabbad 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3418,7 +3418,7 @@ BBTRulerDrag::start_grab (GdkEvent* event, Gdk::Cursor* cursor) ostringstream sstr; _tempo = const_cast (&map.tempo_section_at (raw_grab_frame())); - sstr << "^" << fixed << setprecision(3) << map.tempo_at (adjusted_current_frame (event)).beats_per_minute() << "\n"; + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (adjusted_current_frame (event)).beats_per_minute() << "\n"; sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); show_verbose_cursor_text (sstr.str()); finished (event, false); @@ -3461,7 +3461,7 @@ BBTRulerDrag::motion (GdkEvent* event, bool first_move) _editor->session()->tempo_map().gui_dilate_tempo (_tempo, map.frame_at_pulse (_pulse), pf, _pulse); } ostringstream sstr; - sstr << "^" << fixed << setprecision(3) << map.tempo_at (pf).beats_per_minute() << "\n"; + sstr << "^" << fixed << setprecision(3) << map.tempo_at_frame (pf).beats_per_minute() << "\n"; sstr << "<" << fixed << setprecision(3) << _tempo->beats_per_minute(); show_verbose_cursor_text (sstr.str()); } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index ef04f84b76..adf0f72fe3 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -316,7 +316,7 @@ Editor::mouse_add_new_tempo_event (framepos_t frame) if (pulse > 0.0) { XMLNode &before = map.get_state(); /* add music-locked ramped (?) tempo using the bpm/note type at frame*/ - map.add_tempo (map.tempo_at (frame), pulse, 0, TempoSection::Ramp, MusicTime); + map.add_tempo (map.tempo_at_frame (frame), pulse, 0, TempoSection::Ramp, MusicTime); XMLNode &after = map.get_state(); _session->add_command(new MementoCommand(map, &before, &after)); diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index e8579a94f5..62b2646b81 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -116,7 +116,7 @@ StepEditor::prepare_step_edit_region () } else { const Meter& m = _mtv.session()->tempo_map().meter_at (step_edit_insert_position); - const Tempo& t = _mtv.session()->tempo_map().tempo_at (step_edit_insert_position); + const Tempo& t = _mtv.session()->tempo_map().tempo_at_frame (step_edit_insert_position); double baf = _mtv.session()->tempo_map().beat_at_frame (step_edit_insert_position); double next_bar_in_beats = baf + m.divisions_per_bar(); diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 5cb897e148..b68e82f30b 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -46,7 +46,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) , tap_tempo_button (_("Tap tempo")) { Timecode::BBT_Time when; - Tempo tempo (map.tempo_at (frame)); + Tempo tempo (map.tempo_at_frame (frame)); map.bbt_time (frame, when); init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, MusicTime); -- cgit v1.2.3