From 7d6f7bfe5af5109bf50a1d075b7c6304784b4c19 Mon Sep 17 00:00:00 2001 From: Valeriy Kamyshniy Date: Fri, 27 Feb 2015 03:10:44 +0200 Subject: [PATCH] =?UTF-8?q?[Summary]=20Getting=20most=20recent=20changes?= =?UTF-8?q?=20from=20ARDOUR=E2=80=99s=20git.=20These=20changes=20fix=20a?= =?UTF-8?q?=20bug=20with=20broken=20export=20in=20case=20of=20exporting=20?= =?UTF-8?q?the=20Play=20Loop.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- libs/audiographer/audiographer/general/chunker.h | 2 +- libs/audiographer/audiographer/general/silence_trimmer.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libs/audiographer/audiographer/general/chunker.h b/libs/audiographer/audiographer/general/chunker.h index 0ee0c20b20..d61c68dee4 100644 --- a/libs/audiographer/audiographer/general/chunker.h +++ b/libs/audiographer/audiographer/general/chunker.h @@ -67,7 +67,7 @@ class /*LIBAUDIOGRAPHER_API*/ Chunker position += frames_left; } - if (context.has_flag (ProcessContext::EndOfInput)) { + if (context.has_flag (ProcessContext::EndOfInput) && position > 0) { ProcessContext c_out (context, buffer, position); ListedSource::output (c_out); } diff --git a/libs/audiographer/audiographer/general/silence_trimmer.h b/libs/audiographer/audiographer/general/silence_trimmer.h index c0d6d73c4b..a715feb0c8 100644 --- a/libs/audiographer/audiographer/general/silence_trimmer.h +++ b/libs/audiographer/audiographer/general/silence_trimmer.h @@ -128,7 +128,7 @@ class /*LIBAUDIOGRAPHER_API*/ SilenceTrimmer check_flags (*this, c); if (throw_level (ThrowStrict) && in_end) { - throw Exception(*this, "process() after reacing end of input"); + throw Exception(*this, "process() after reaching end of input"); } in_end = c.has_flag (ProcessContext::EndOfInput);