From a2495cdff33c152ce1255f9ab9a5ba178db29fef Mon Sep 17 00:00:00 2001 From: nick_m Date: Sat, 13 Feb 2016 04:23:02 +1100 Subject: Tempo ramps - fix more namespace confusion --- gtk2_ardour/tempo_dialog.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/tempo_dialog.cc') 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; -- cgit v1.2.3