NO-OP; clean up script spacing and remove goto

[ardour.git] / gtk2_ardour / step_editor.cc

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index 8afc0ed8261cbe176cb2fb1d15ecf47972a2b517..ac51076a46a11d31acdebd7026600b7e2a8ee572 100644 (file)
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -116,8 +116,7 @@ StepEditor::prepare_step_edit_region ()
        } else {
 
                const Meter& m = _mtv.session()->tempo_map().meter_at_frame (step_edit_insert_position);
-
-               double baf = _mtv.session()->tempo_map().beat_at_frame (step_edit_insert_position);
+               double baf = max (0.0, _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;
@@ -411,7 +410,7 @@ StepEditor::step_edit_bar_sync ()
        }
 
        framepos_t fpos = step_edit_region_view->region_beats_to_absolute_frames (step_edit_beat_pos);
-       fpos = _session->tempo_map().round_to_bar (fpos, RoundUpAlways);
+       fpos = _session->tempo_map().round_to_bar (fpos, RoundUpAlways).frame;
        step_edit_beat_pos = step_edit_region_view->region_frames_to_region_beats (fpos - step_edit_region->position()).round_up_to_beat();
        step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
 }