destroy splash when hiding it to workaround odd bug on OS X where the window will...

[ardour.git] / gtk2_ardour / step_editor.cc

diff --git a/gtk2_ardour/step_editor.cc b/gtk2_ardour/step_editor.cc
index aa0095b1d5959b380a561eedc78d0669ef4023eb..2b5ab0f69009c9488cd57faab6441a3ba3edb21a 100644 (file)
--- a/gtk2_ardour/step_editor.cc
+++ b/gtk2_ardour/step_editor.cc
@@ -272,8 +272,8 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
                    up by 1 tick from where the last note ended
                 */
 
-                at += 1.0/Timecode::BBT_Time::ticks_per_bar_division;
-                len -= 1.0/Timecode::BBT_Time::ticks_per_bar_division;
+                at += 1.0/Timecode::BBT_Time::ticks_per_beat;
+                len -= 1.0/Timecode::BBT_Time::ticks_per_beat;
         }
 
         step_edit_region_view->step_add_note (channel, pitch, velocity, at, len);
@@ -293,7 +293,7 @@ StepEditor::step_add_note (uint8_t channel, uint8_t pitch, uint8_t velocity, Evo
                 step_edit_beat_pos += beat_duration;
                 step_edit_region_view->move_step_edit_cursor (step_edit_beat_pos);
         } else {
-                step_edit_beat_pos += 1.0/Timecode::BBT_Time::ticks_per_bar_division; // tiny, but no longer overlapping
+                step_edit_beat_pos += 1.0/Timecode::BBT_Time::ticks_per_beat; // tiny, but no longer overlapping
                 _step_edit_chord_duration = max (_step_edit_chord_duration, beat_duration);
         }
 
@@ -388,7 +388,7 @@ StepEditor::playlist_changed ()
 {
         step_edit_region_connection.disconnect ();
         _track->playlist()->RegionRemoved.connect (step_edit_region_connection, invalidator (*this),
-                                                   ui_bind (&StepEditor::region_removed, this, _1),
+                                                   boost::bind (&StepEditor::region_removed, this, _1),
                                                    gui_context());
 }