From 34c9ac9dd7b1187d9efa2c6894fccba34fe298cd Mon Sep 17 00:00:00 2001 From: nick_m Date: Fri, 27 May 2016 03:22:24 +1000 Subject: Tempo ramps - rename bbt_time() -> bbt_at_frame(), frame_time() -> frame_at_bbt() --- gtk2_ardour/audio_clock.cc | 4 ++-- gtk2_ardour/editor_drag.cc | 2 +- gtk2_ardour/editor_regions.cc | 2 +- gtk2_ardour/editor_rulers.cc | 6 +++--- gtk2_ardour/editor_tempodisplay.cc | 4 ++-- gtk2_ardour/midi_list_editor.cc | 4 +--- gtk2_ardour/tempo_dialog.cc | 13 +++++-------- 7 files changed, 15 insertions(+), 20 deletions(-) (limited to 'gtk2_ardour') diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 7cdf66123d..ee28f138e2 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1258,12 +1258,12 @@ AudioClock::set_bbt (framepos_t when, bool /*force*/) BBT.beats = 0; BBT.ticks = 0; } else { - _session->tempo_map().bbt_time (when, BBT); + BBT = _session->tempo_map().bbt_at_frame (when); BBT.bars--; BBT.beats--; } } else { - _session->tempo_map().bbt_time (when, BBT); + BBT = _session->tempo_map().bbt_at_frame (when); } if (negative) { diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 07b2eabbad..12216bc3c0 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -3180,7 +3180,7 @@ MeterMarkerDrag::motion (GdkEvent* event, bool first_move) } const double beat = map.beat_at_bbt (bbt); _real_section = map.add_meter (Meter (_marker->meter().divisions_per_bar(), _marker->meter().note_divisor()) - , beat, bbt, map.frame_time (bbt), _real_section->position_lock_style()); + , beat, bbt, map.frame_at_bbt (bbt), _real_section->position_lock_style()); } } diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index f95e5b797e..8321931871 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -728,7 +728,7 @@ EditorRegions::format_position (framepos_t pos, char* buf, size_t bufsize, bool switch (ARDOUR_UI::instance()->secondary_clock->mode ()) { case AudioClock::BBT: - _session->tempo_map().bbt_time (pos, bbt); + bbt = _session->tempo_map().bbt_at_frame (pos); if (onoff) { snprintf (buf, bufsize, "%03d|%02d|%04d" , bbt.bars, bbt.beats, bbt.ticks); } else { diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index f2b42fccc3..596f4f26b9 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -1275,7 +1275,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; @@ -1345,7 +1345,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l next_beat.beats = (*i).beat; next_beat.bars = (*i).bar; next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; @@ -1421,7 +1421,7 @@ Editor::metric_get_bbt (std::vector& marks, gdouble l while (tick < Timecode::BBT_Time::ticks_per_beat && (n < bbt_nmarks)) { next_beat.ticks = tick; - pos = _session->tempo_map().frame_time (next_beat); + pos = _session->tempo_map().frame_at_bbt (next_beat); if (t % bbt_accent_modulo == (bbt_accent_modulo - 1)) { i_am_accented = true; } diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index adf0f72fe3..7af6fef059 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -358,7 +358,7 @@ Editor::mouse_add_new_meter_event (framepos_t frame) if (meter_dialog.get_lock_style() == MusicTime) { map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, 0, MusicTime); } else { - map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_time (requested), AudioTime); + map.add_meter (Meter (bpb, note_type), map.beat_at_bbt (requested), requested, map.frame_at_bbt (requested), AudioTime); } _session->add_command(new MementoCommand(map, &before, &map.get_state())); @@ -406,7 +406,7 @@ Editor::edit_meter_section (MeterSection* section) double const note_type = meter_dialog.get_note_type (); Timecode::BBT_Time when; meter_dialog.get_bbt_time (when); - framepos_t const frame = _session->tempo_map().frame_time (when); + framepos_t const frame = _session->tempo_map().frame_at_bbt (when); begin_reversible_command (_("replace meter mark")); XMLNode &before = _session->tempo_map().get_state(); diff --git a/gtk2_ardour/midi_list_editor.cc b/gtk2_ardour/midi_list_editor.cc index 6334c38dcc..e0eda7a536 100644 --- a/gtk2_ardour/midi_list_editor.cc +++ b/gtk2_ardour/midi_list_editor.cc @@ -764,9 +764,7 @@ MidiListEditor::redisplay_model () row[columns.note] = (*i)->note(); row[columns.velocity] = (*i)->velocity(); - Timecode::BBT_Time bbt; - - _session->tempo_map().bbt_time (conv.to ((*i)->time()), bbt); + Timecode::BBT_Time bbt (_session->tempo_map().bbt_at_frame (conv.to ((*i)->time()))); ss.str (""); ss << bbt; diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index b4951f35ca..68a781a54f 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -45,9 +45,8 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { - Timecode::BBT_Time when; Tempo tempo (map.tempo_at_frame (frame)); - map.bbt_time (frame, when); + Timecode::BBT_Time when (map.bbt_at_frame (frame)); init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true, MusicTime); } @@ -63,8 +62,7 @@ TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) , pulse_selector_label (_("Pulse note"), ALIGN_LEFT, ALIGN_CENTER) , tap_tempo_button (_("Tap tempo")) { - Timecode::BBT_Time when; - map.bbt_time (section.frame(), when); + Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); init (when, section.beats_per_minute(), section.note_type(), section.type(), section.movable(), section.position_lock_style()); } @@ -420,19 +418,18 @@ TempoDialog::tap_tempo_focus_out (GdkEventFocus* ) MeterDialog::MeterDialog (TempoMap& map, framepos_t frame, const string&) : ArdourDialog (_("New Meter")) { - Timecode::BBT_Time when; frame = map.round_to_bar(frame, RoundNearest); + Timecode::BBT_Time when (map.bbt_at_frame (frame)); Meter meter (map.meter_at_frame (frame)); - map.bbt_time (frame, when); init (when, meter.divisions_per_bar(), meter.note_divisor(), true, MusicTime); } MeterDialog::MeterDialog (TempoMap& map, MeterSection& section, const string&) : ArdourDialog (_("Edit Meter")) { - Timecode::BBT_Time when; - map.bbt_time (section.frame(), when); + Timecode::BBT_Time when (map.bbt_at_frame (section.frame())); + init (when, section.divisions_per_bar(), section.note_divisor(), section.movable(), section.position_lock_style()); } -- cgit v1.2.3