diff options
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index 59a5e8d6db..1cc9d54cb6 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -6552,7 +6552,7 @@ Editor::define_one_bar (framepos_t start, framepos_t end) } else if (t.frame() == start) { _session->tempo_map().change_existing_tempo_at (start, beats_per_minute, t.note_type()); } else { - _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), _session->tempo_map().beat_at_frame (start), TempoSection::Type::Constant); + _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), _session->tempo_map().beat_at_frame (start), TempoSection::Constant); } XMLNode& after (_session->tempo_map().get_state()); diff --git a/gtk2_ardour/tempo_dialog.cc b/gtk2_ardour/tempo_dialog.cc index 881da33617..c9609c4a0a 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -47,7 +47,7 @@ TempoDialog::TempoDialog (TempoMap& map, framepos_t frame, const string&) Tempo tempo (map.tempo_at (frame)); map.bbt_time (frame, when); - init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Type::Constant, true); + init (when, tempo.beats_per_minute(), tempo.note_type(), TempoSection::Constant, true); } TempoDialog::TempoDialog (TempoMap& map, TempoSection& section, const string&) @@ -110,9 +110,9 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, strings.clear(); - tempo_types.insert (make_pair (_("ramped"), TempoSection::Type::Ramp)); + tempo_types.insert (make_pair (_("ramped"), TempoSection::Ramp)); strings.push_back (_("ramped")); - tempo_types.insert (make_pair (_("constant"), TempoSection::Type::Constant)); + tempo_types.insert (make_pair (_("constant"), TempoSection::Constant)); strings.push_back (_("constant")); set_popdown_strings (tempo_type, strings); TempoTypes::iterator tt; @@ -290,7 +290,7 @@ TempoDialog::get_tempo_type () if (x == tempo_types.end()) { error << string_compose(_("incomprehensible tempo type (%1)"), tempo_type.get_active_text()) << endmsg; - return TempoSection::Type::Constant; + return TempoSection::Constant; } return x->second; |