fix thinko-typo in SoloControl::soloed_by_others()

[ardour.git] / gtk2_ardour / step_editor.cc

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index a1beefb30c63e5032aa52224c0e47e0e70f20f91..3ea3bb4ccd6cd99427a07c8a18edc11152adcf15 100644 (file)
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012 Paul Davis 
+    Copyright (C) 2012 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -115,10 +115,14 @@ StepEditor::prepare_step_edit_region ()
 
        } else {
 
-               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);
+               const Meter& m = _mtv.session()->tempo_map().meter_at_frame (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, _editor.get_grid_music_divisions (0));
 
                RegionView* rv = _mtv.midi_view()->find_view (step_edit_region);
                step_edit_region_view = dynamic_cast<MidiRegionView*>(rv);
@@ -320,6 +324,8 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
                _step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
        }
 
+       step_edit_region_view->set_step_edit_cursor_width (step_editor->note_length());
+
        return 0;
 }