summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Chappell <jesse@essej.net>2007-04-28 13:31:44 +0000
committerJesse Chappell <jesse@essej.net>2007-04-28 13:31:44 +0000
commit41853ad9ea3afa76c06eed96972c7c11c5061d0f (patch)
treeae497a720958e871d592a4ee96dec055873570e1
parenta77e3c821bba704ddf8852fc7631e09e45bbdac1 (diff)
fixed potential infinite loop when searching for automation events.
git-svn-id: svn://localhost/ardour2/trunk@1760 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r--libs/ardour/insert.cc2
-rw-r--r--tools/osx_packaging/ardour2_mac_ui.rc1
2 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/insert.cc b/libs/ardour/insert.cc
index 11d41cfab4..ccc73946b5 100644
--- 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 6528257e74..977bc649e5 100644
--- 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"