From e9bfdcf7782de657aca8689b81dd77fa1809b7c3 Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 09 2010 15:41:51 +0000
Subject: - Merge improved resample patch from Richard Ash.


---

diff --git a/audacity-1.3.10-resample.patch b/audacity-1.3.10-resample.patch
index a766066..f4d23f4 100644
--- a/audacity-1.3.10-resample.patch
+++ b/audacity-1.3.10-resample.patch
@@ -1,16 +1,17 @@
-This changes the "end_of_input" parameter from True to False,
-because if setting it to True for all buffers, resampling stops early
-(reproducible with libsamplerate 0.1.7).
-
 diff -Nur audacity-src-1.3.10-orig/src/AudioIO.cpp audacity-src-1.3.10/src/AudioIO.cpp
 --- audacity-src-1.3.10-orig/src/AudioIO.cpp	2009-12-01 20:32:08.000000000 +0100
-+++ audacity-src-1.3.10/src/AudioIO.cpp	2009-12-28 00:50:11.906619016 +0100
-@@ -2253,7 +2253,7 @@
++++ audacity-src-1.3.10/src/AudioIO.cpp	2010-01-09 16:34:35.705647887 +0100
+@@ -2252,8 +2252,11 @@
+                samplePtr temp1 = NewSamples(avail, floatSample);
                 samplePtr temp2 = NewSamples(size, floatSample);
                 mCaptureBuffers[i]->Get(temp1, floatSample, avail);
- 
+-
 -               size = mResample[i]->Process(mFactor, (float *)temp1, avail, true,
-+               size = mResample[i]->Process(mFactor, (float *)temp1, avail, false,
++               /* we are re-sampling on the fly. The last resampling call
++                * must flush any samples left in the rate conversion buffer
++                * so that they get recorded
++                */
++               size = mResample[i]->Process(mFactor, (float *)temp1, avail, !IsStreamActive(),
                                              &size, (float *)temp2, size);
                 mCaptureTracks[i]-> Append(temp2, floatSample, size, 1, 
                                            &appendLog);
diff --git a/audacity.spec b/audacity.spec
index 241ee65..6f9dc41 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -5,7 +5,7 @@
 
 Name: audacity
 Version: 1.3.10
-Release: 0.2.beta%{?dist}
+Release: 0.3.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
@@ -148,6 +148,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Sat Jan  9 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.10-0.3.beta
+- Merge improved resample patch from Richard Ash.
+
 * Mon Dec 28 2009 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.10-0.2.beta
 - Patch resampling call to not set end_of_input flag for all sample buffers.