diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-22 01:21:54 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | 7898435d3f94355fa0996dc9f85b3bc1ef173585 (patch) | |
| tree | 77dd39b6122330328b15046a8ae45e4fdaeda483 /gtk2_ardour/tempo_dialog.cc | |
| parent | 9eeccf0c17094708996c3c491f265877b04199fe (diff) | |
Tempo ramps - define_one_bar() delivers constant tempo.
- also some renaming and code review
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 613a2d9a5a..2c45d50085 100644 --- a/gtk2_ardour/tempo_dialog.cc +++ b/gtk2_ardour/tempo_dialog.cc @@ -108,9 +108,9 @@ TempoDialog::init (const Timecode::BBT_Time& when, double bpm, double note_type, strings.clear(); - tempo_types.insert (make_pair (_("ramped"), TempoSection::TempoSectionType::Ramp)); + tempo_types.insert (make_pair (_("ramped"), TempoSection::Type::Ramp)); strings.push_back (_("ramped")); - tempo_types.insert (make_pair (_("constant"), TempoSection::TempoSectionType::Constant)); + tempo_types.insert (make_pair (_("constant"), TempoSection::Type::Constant)); strings.push_back (_("constant")); set_popdown_strings (tempo_type, strings); tempo_type.set_active_text (strings[0]); // "ramped" @@ -272,14 +272,14 @@ TempoDialog::get_note_type () return x->second; } -TempoSection::TempoSectionType +TempoSection::Type TempoDialog::get_tempo_type () { TempoTypes::iterator x = tempo_types.find (tempo_type.get_active_text()); if (x == tempo_types.end()) { error << string_compose(_("incomprehensible pulse note type (%1)"), tempo_type.get_active_text()) << endmsg; - return TempoSection::TempoSectionType::Constant; + return TempoSection::Type::Constant; } return x->second; |