diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-02-13 04:23:02 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | a2495cdff33c152ce1255f9ab9a5ba178db29fef (patch) | |
| tree | 5a7c5f7517a0a428b7a8a2d7d5feecc154ae2393 /gtk2_ardour/tempo_dialog.cc | |
| parent | 36f04367dff567a24f94b8686b0625d9b51210ef (diff) | |
Tempo ramps - fix more namespace confusion
Diffstat (limited to 'gtk2_ardour/tempo_dialog.cc')
| -rw-r--r-- | gtk2_ardour/tempo_dialog.cc | 8 |
1 files changed, 4 insertions, 4 deletions
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; |