smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-24 06:07:29 +01:00
Code Issues Projects Releases Wiki Activity

carl's patch for #3461, applied to 2.X

Browse source 
git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@7812 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2010-09-20 13:36:53 +00:00
parent 14c9fb2bc9
commit 13f05dc115
2 changed files with 14 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

3
gtk2_ardour/audio_streamview.cc
View file

@ -378,6 +378,8 @@ AudioStreamView::redisplay_diskstream ()
list<RegionView *>::iterator i, tmp;
list<CrossfadeView*>::iterator xi, tmpx;
cerr << "REDISPLAY diskstream\n";
for (i = region_views.begin(); i != region_views.end(); ++i) {
(*i)->set_valid (false);
}
@ -424,6 +426,7 @@ AudioStreamView::redisplay_diskstream ()
/* now fix layering */
for (RegionViewList::iterator i = region_views.begin(); i != region_views.end(); ++i) {
cerr << "Layering call for " << (*i)->region()->name() << endl;
region_layered (*i);
}
}

21
libs/ardour/curve.cc
View file

@ -312,7 +312,7 @@ Curve::_get_vector (double x0, double x1, float *vec, int64_t veclen)
return;
}
if (npoints == 1 ) {
if (npoints == 1) {
for (i = 0; i < veclen; ++i) {
vec[i] = events.front()->value;
@ -355,17 +355,18 @@ Curve::_get_vector (double x0, double x1, float *vec, int64_t veclen)
rx = lx;
/* note: if there are veclen elements in the output,
there are only veclen-1 steps between them.
*/
if (veclen > 1) {
/* note: if there are veclen elements in the output,
there are only veclen-1 steps between them.
*/
dx = (hx - lx) / (veclen-1);
for (i = 0; i < veclen; ++i, rx += dx) {
vec[i] = multipoint_eval (rx);
}
} else {
dx = 0;
}
for (i = 0; i < veclen; ++i, rx += dx) {
vec[i] = multipoint_eval (rx);
}
}