fixed potential infinite loop when searching for automation events.

git-svn-id: svn://localhost/ardour2/trunk@1760 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/libs/ardour/insert.cc b/libs/ardour/insert.cc
index 11d41cfab4ac8e145203a1ae63fc43f0ad6fb1a3..ccc73946b57d20eb1c2db2adcab2f138d847b200 100644 (file)
--- a/libs/ardour/insert.cc
+++ b/libs/ardour/insert.cc
@@ -415,7 +415,7 @@ PluginInsert::automation_run (vector<Sample *>& bufs, uint32_t nbufs, nframes_t
        
        while (nframes) {
 
-               nframes_t cnt = min (((nframes_t) floor (next_event.when) - now), nframes);
+               nframes_t cnt = min (((nframes_t) ceil (next_event.when) - now), nframes);
   
                connect_and_run (bufs, nbufs, cnt, offset, true, now);
                

diff --git a/tools/osx_packaging/ardour2_mac_ui.rc b/tools/osx_packaging/ardour2_mac_ui.rc
index 6528257e740c3e67db28fe6b26100bc5ebc9b119..977bc649e52f3367f5e622302b7db829c12b0b60 100644 (file)
--- a/tools/osx_packaging/ardour2_mac_ui.rc
+++ b/tools/osx_packaging/ardour2_mac_ui.rc
@@ -448,6 +448,7 @@ style "editor_hscrollbar" = "ardour_adjusters"
        # make it bigger.
        # 
        GtkRange::slider_width = 27
+        GtkScrollbar::slider_width = 27
 }
 
 style "ardour_progressbars" = "default_buttons_menus"