summaryrefslogtreecommitdiff
path: root/libs/ardour/auditioner.cc
diff options
context:
space:
mode:
authorRobin Gareus <robin@gareus.org>2015-01-13 18:36:10 +0100
committerRobin Gareus <robin@gareus.org>2015-01-13 18:36:10 +0100
commit12d437521145a9ab39d9d6f2a9c3c237df3fbc73 (patch)
tree08311d9fac328ff99cd23eb7ce4637211285f52c /libs/ardour/auditioner.cc
parent5ef868e767dfcc27a1ece9eadbf6366511b9862e (diff)
fix auditioning of regions with offset - fixes #6131
Diffstat (limited to 'libs/ardour/auditioner.cc')
-rw-r--r--libs/ardour/auditioner.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc
index 96304b0b3b..184688c3c3 100644
--- a/libs/ardour/auditioner.cc
+++ b/libs/ardour/auditioner.cc
@@ -514,7 +514,7 @@ Auditioner::play_audition (framecnt_t nframes)
if(!_seeking) {
/* process audio */
- this_nframes = min (nframes, length - current_frame);
+ this_nframes = min (nframes, length - current_frame + _import_position);
if ((ret = roll (this_nframes, current_frame, current_frame + nframes, false, need_butler)) != 0) {
silence (nframes);
@@ -538,7 +538,7 @@ Auditioner::play_audition (framecnt_t nframes)
AuditionProgress(current_frame - _import_position, length); /* emit */
}
- if (current_frame >= length) {
+ if (current_frame >= length + _import_position) {
_session.cancel_audition ();
return 0;
} else {