diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-02-06 06:07:27 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | 87d49cd6ec88d7c89884735a450d79631466b82a (patch) | |
| tree | c034607133ff58766504ba2de0b93236c657b482 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 885f1fd684da31a730f90ebad23ad9ff39baedb0 (diff) | |
Tempo ramps - api rename, fix various meter and tempo dialog bugs.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index 0cb53ee5b4..8361315495 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -317,7 +317,7 @@ Editor::remove_tempo_marker (ArdourCanvas::Item* item) void Editor::edit_meter_section (MeterSection* section) { - MeterDialog meter_dialog (*section, _("done")); + MeterDialog meter_dialog (_session->tempo_map(), *section, _("done")); switch (meter_dialog.run()) { case RESPONSE_ACCEPT: @@ -336,7 +336,7 @@ Editor::edit_meter_section (MeterSection* section) begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), _session->tempo_map().bbt_to_beats (when), when); + _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); commit_reversible_command (); @@ -345,7 +345,7 @@ Editor::edit_meter_section (MeterSection* section) void Editor::edit_tempo_section (TempoSection* section) { - TempoDialog tempo_dialog (*section, _("done")); + TempoDialog tempo_dialog (_session->tempo_map(), *section, _("done")); switch (tempo_dialog.run ()) { case RESPONSE_ACCEPT: |