diff options
| author | nick_m <mainsbridge@gmail.com> | 2016-03-02 02:07:32 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:10 +1000 |
| commit | 77abc08d6f28ee657aa8dfdb36fd9acc91a1e4b7 (patch) | |
| tree | f8213212b261a552d9395e463265ea53b20939e9 /gtk2_ardour/editor_tempodisplay.cc | |
| parent | 474784c8bae262a7e310116b2b5250e5e925685a (diff) | |
Tempo ramps - fix crash-causing locking errors. clean up code a bit.
Diffstat (limited to 'gtk2_ardour/editor_tempodisplay.cc')
| -rw-r--r-- | gtk2_ardour/editor_tempodisplay.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_tempodisplay.cc b/gtk2_ardour/editor_tempodisplay.cc index a971e98abe..8509407ff6 100644 --- a/gtk2_ardour/editor_tempodisplay.cc +++ b/gtk2_ardour/editor_tempodisplay.cc @@ -335,7 +335,7 @@ Editor::edit_meter_section (MeterSection* section) double bpb = meter_dialog.get_bpb (); bpb = max (1.0, bpb); // XXX is this a reasonable limit? - double note_type = meter_dialog.get_note_type (); + double const note_type = meter_dialog.get_note_type (); Timecode::BBT_Time when; meter_dialog.get_bbt_time(when); framepos_t const frame = _session->tempo_map().frame_at_beat (_session->tempo_map().bbt_to_beats (when)); @@ -345,7 +345,7 @@ Editor::edit_meter_section (MeterSection* section) if (meter_dialog.get_lock_style() == MusicTime) { _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), when); } else { - _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), section->frame()); + _session->tempo_map().replace_meter (*section, Meter (bpb, note_type), frame); } XMLNode &after = _session->tempo_map().get_state(); _session->add_command(new MementoCommand<TempoMap>(_session->tempo_map(), &before, &after)); @@ -366,12 +366,12 @@ Editor::edit_tempo_section (TempoSection* section) double bpm = tempo_dialog.get_bpm (); double nt = tempo_dialog.get_note_type (); - double beat; Timecode::BBT_Time when; tempo_dialog.get_bbt_time(when); + double const beat = _session->tempo_map().bbt_to_beats (when); + bpm = max (0.01, bpm); - beat = _session->tempo_map().bbt_to_beats (when); begin_reversible_command (_("replace tempo mark")); XMLNode &before = _session->tempo_map().get_state(); |