follow new const requirements associated with Meter/Tempo
This commit is contained in:
parent
1f8290f154
commit
5f3ad2cde9
@ -1042,13 +1042,13 @@ Editor::set_xjadeo_viewoption (int what)
|
||||
void
|
||||
Editor::edit_current_meter ()
|
||||
{
|
||||
edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).meter());
|
||||
edit_meter_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_meter());
|
||||
}
|
||||
|
||||
void
|
||||
Editor::edit_current_tempo ()
|
||||
{
|
||||
edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).tempo());
|
||||
edit_tempo_section (Temporal::TempoMap::use()->metric_at (ARDOUR_UI::instance()->primary_clock->absolute_time()).get_editable_tempo());
|
||||
}
|
||||
|
||||
RefPtr<RadioAction>
|
||||
|
@ -150,14 +150,14 @@ void
|
||||
MainClock::edit_current_tempo ()
|
||||
{
|
||||
if (!PublicEditor::instance().session()) return;
|
||||
PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->tempo_at (absolute_time()));
|
||||
PublicEditor::instance().edit_tempo_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_tempo());
|
||||
}
|
||||
|
||||
void
|
||||
MainClock::edit_current_meter ()
|
||||
{
|
||||
if (!PublicEditor::instance().session()) return;
|
||||
PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->meter_at (absolute_time()));
|
||||
PublicEditor::instance().edit_meter_section (Temporal::TempoMap::use()->metric_at (absolute_time()).get_editable_meter());
|
||||
}
|
||||
|
||||
void
|
||||
|
@ -59,7 +59,7 @@ TempoDialog::TempoDialog (TempoMap::SharedPtr const & map, timepos_t const & pos
|
||||
, tap_tempo_button (_("Tap tempo"))
|
||||
{
|
||||
Temporal::BBT_Time when (_map->bbt_at (pos));
|
||||
Tempo& tempo (_map->tempo_at (pos));
|
||||
Tempo const & tempo (_map->tempo_at (pos));
|
||||
|
||||
init (when, tempo.note_types_per_minute(), tempo.end_note_types_per_minute(), tempo.note_type(), Tempo::Constant, true, BeatTime);
|
||||
}
|
||||
@ -490,7 +490,7 @@ MeterDialog::MeterDialog (TempoMap::SharedPtr const & map, timepos_t const & pos
|
||||
: ArdourDialog (_("New Meter"))
|
||||
{
|
||||
Temporal::BBT_Time when (map->round_to_bar (map->bbt_at (pos)));
|
||||
Meter& meter (map->meter_at (when));
|
||||
Meter const & meter (map->meter_at (when));
|
||||
|
||||
init (when, meter.divisions_per_bar(), meter.note_value(), false, pos.time_domain());
|
||||
}
|
||||
|
@ -145,7 +145,7 @@ VerboseCursor::set_duration (samplepos_t start, samplepos_t end)
|
||||
Timecode::Time timecode;
|
||||
Temporal::BBT_Time sbbt;
|
||||
Temporal::BBT_Time ebbt;
|
||||
Meter& meter_at_start (TempoMap::use()->metric_at (start).meter());
|
||||
Meter const & meter_at_start (TempoMap::use()->metric_at (start).meter());
|
||||
|
||||
if (_editor->_session == 0) {
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user