rpms/audacity/devel audacity-1.3.10-resample.patch, 1.1, 1.2 audacity.spec, 1.89, 1.90

[Michael Schwendt]

Author: mschwendt

Update of /cvs/pkgs/rpms/audacity/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv7920/devel

Modified Files:
	audacity-1.3.10-resample.patch audacity.spec 
Log Message:
* Sat Jan  9 2010 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.3.beta
- Merge improved resample patch from Richard Ash.


audacity-1.3.10-resample.patch:
 AudioIO.cpp |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

Index: audacity-1.3.10-resample.patch
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity-1.3.10-resample.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -p -r1.1 -r1.2
--- audacity-1.3.10-resample.patch	28 Dec 2009 00:27:57 -0000	1.1
+++ audacity-1.3.10-resample.patch	9 Jan 2010 15:41:51 -0000	1.2
@@ -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);


Index: audacity.spec
===================================================================
RCS file: /cvs/pkgs/rpms/audacity/devel/audacity.spec,v
retrieving revision 1.89
retrieving revision 1.90
diff -u -p -r1.89 -r1.90
--- audacity.spec	28 Dec 2009 00:27:57 -0000	1.89
+++ audacity.spec	9 Jan 2010 15:41:51 -0000	1.90
@@ -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 at fedoraproject.org> - 1.3.10-0.3.beta
+- Merge improved resample patch from Richard Ash.
+
 * Mon Dec 28 2009 Michael Schwendt <mschwendt at fedoraproject.org> - 1.3.10-0.2.beta
 - Patch resampling call to not set end_of_input flag for all sample buffers.