diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-19 18:40:21 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2012-12-19 18:40:21 +0000 |
| commit | 17f7242ed67b35647679e5f9c7dbad1a0bb4760e (patch) | |
| tree | 482fa5cf332cf61c1e1d1abda4dd7708c366dc7f /gtk2_ardour | |
| parent | 5ebd9cb96245d66babcc7435698ad525018b11ca (diff) | |
fix up mistaken (accidentally) automatic cast from framepos_t to double when calling TempoMap::add_tempo(), leading to an assert failure when defining a bar from the edit range (#4682)
git-svn-id: svn://localhost/ardour2/branches/3.0@13684 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_ops.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc index eac60fd332..206677c4ce 100644 --- a/gtk2_ardour/editor_ops.cc +++ b/gtk2_ardour/editor_ops.cc @@ -5869,7 +5869,9 @@ 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()), start); + Timecode::BBT_Time bbt; + _session->tempo_map().bbt_time (start, bbt); + _session->tempo_map().add_tempo (Tempo (beats_per_minute, t.note_type()), bbt); } XMLNode& after (_session->tempo_map().get_state()); |