diff options
| author | nick_m <mainsbridge@gmail.com> | 2015-12-21 05:42:38 +1100 |
|---|---|---|
| committer | nick_m <mainsbridge@gmail.com> | 2016-05-27 23:38:09 +1000 |
| commit | dbfe991cd862aa1d420c65c9808e5f4e199995ed (patch) | |
| tree | 92acced1e410f7b02fc07a3a850118ca4cf21403 /gtk2_ardour/step_editor.cc | |
| parent | 0d0e458dde932965c4e283b0204b6d3011a3c90f (diff) | |
Tempo ramps - fix changing from const to ramp in the gui.
- also fixes some midi mouse over problems
- start using replacements for frames_per_bar() frames_per_beat() etc.
Diffstat (limited to 'gtk2_ardour/step_editor.cc')
| -rw-r--r-- | gtk2_ardour/step_editor.cc | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc index e19f89fa4a..e8579a94f5 100644 --- a/gtk2_ardour/step_editor.cc +++ b/gtk2_ardour/step_editor.cc @@ -118,7 +118,12 @@ StepEditor::prepare_step_edit_region () const Meter& m = _mtv.session()->tempo_map().meter_at (step_edit_insert_position); const Tempo& t = _mtv.session()->tempo_map().tempo_at (step_edit_insert_position); - step_edit_region = _mtv.add_region (step_edit_insert_position, floor (m.frames_per_bar (t, _mtv.session()->frame_rate())), true); + double baf = _mtv.session()->tempo_map().beat_at_frame (step_edit_insert_position); + double next_bar_in_beats = baf + m.divisions_per_bar(); + framecnt_t next_bar_pos = _mtv.session()->tempo_map().frame_at_beat (next_bar_in_beats); + framecnt_t len = next_bar_pos - step_edit_insert_position; + + step_edit_region = _mtv.add_region (step_edit_insert_position, len, true); RegionView* rv = _mtv.midi_view()->find_view (step_edit_region); step_edit_region_view = dynamic_cast<MidiRegionView*>(rv); |