ardour/livetrax
13
0
Fork 0
Code

Tempo ramps - fix more namespace confusion

Browse Source
This commit is contained in:
nick_m 2016-02-13 04:23:02 +11:00
parent 36f04367df
commit a2495cdff3
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor_ops.cc
View File

@ -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());

8
gtk2_ardour/tempo_dialog.cc
View File

@ -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;