From c23f5b04200e76a9a5834135657c329fd9e0c40a Mon Sep 17 00:00:00 2001
From: Michael Schwendt <mschwendt@fedoraproject.org>
Date: Jan 21 2010 11:56:39 +0000
Subject: - Upgrade to 1.3.11-beta.


---

diff --git a/.cvsignore b/.cvsignore
index 12a6209..61a4bd1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-audacity-minsrc-1.3.10.tar.bz2
+audacity-minsrc-1.3.11-beta.tar.bz2
diff --git a/audacity-1.3.10-resample.patch b/audacity-1.3.10-resample.patch
deleted file mode 100644
index f4d23f4..0000000
--- a/audacity-1.3.10-resample.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-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	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,
-+               /* 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-1.3.9-getmaxpeak.patch b/audacity-1.3.9-getmaxpeak.patch
deleted file mode 100644
index 928e39d..0000000
--- a/audacity-1.3.9-getmaxpeak.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur audacity-src-1.3.9-orig/src/AudioIO.cpp audacity-src-1.3.9/src/AudioIO.cpp
---- audacity-src-1.3.9-orig/src/AudioIO.cpp	2009-08-31 12:45:38.000000000 +0200
-+++ audacity-src-1.3.9/src/AudioIO.cpp	2009-12-04 14:40:41.559205870 +0100
-@@ -2750,7 +2750,7 @@
- 
-    // Stop recording if 'silence' is detected
-    if(gAudioIO->mPauseRec && inputBuffer) {
--      if(gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel ) {
-+      if(gAudioIO->mInputMeter && (gAudioIO->mInputMeter->GetMaxPeak() < gAudioIO->mSilenceLevel) ) {
-          if(!gAudioIO->IsPaused()) {
-             AudacityProject *p = GetActiveProject();
-             wxCommandEvent dummyEvt;
diff --git a/audacity.spec b/audacity.spec
index d889d87..0956f16 100644
--- a/audacity.spec
+++ b/audacity.spec
@@ -1,17 +1,17 @@
 # Compile options:
 # --with mp3          : enable mp3 support
 
-%define tartopdir audacity-src-1.3.10
+%define tartopdir audacity-src-1.3.11-beta
 
 Name: audacity
-Version: 1.3.10
-Release: 0.4.beta%{?dist}
+Version: 1.3.11
+Release: 0.1.beta%{?dist}
 Summary: Multitrack audio editor
 Group: Applications/Multimedia
 License: GPLv2
 URL: http://audacity.sourceforge.net
 
-Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}.tar.bz2
+Source0: http://downloads.sf.net/sourceforge/audacity/audacity-minsrc-%{version}-beta.tar.bz2
 Source1: audacity.png
 
 Patch1: audacity-1.3.7-libmp3lame-default.patch
@@ -22,10 +22,6 @@ Patch2: audacity-1.3.9-libdir.patch
 # add categories Sequencer X-Jack AudioVideoEditing for F-12 Studio feature
 Patch3: audacity-1.3.10-desktop.patch
 Patch6: audacity-1.3.7-vamp-1.3.patch
-# obsolete with version upgrade
-Patch7: audacity-1.3.9-getmaxpeak.patch
-# obsolete with version upgrade
-Patch8: audacity-1.3.10-resample.patch
 
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires: alsa-lib-devel
@@ -78,8 +74,6 @@ grep -q -s __RPM_LIB * -R && exit 1
 %if 0%{?fedora} < 11
 %patch6 -p1 -b .vamp-1.3
 %endif
-%patch7 -p1 -b .getmaxpeak
-%patch8 -p1 -b .resample
 
 # Substitute occurences of "libmp3lame.so" with "libmp3lame.so.0".
 for i in locale/*.po src/export/ExportMP3.cpp
@@ -155,6 +149,9 @@ update-desktop-database &> /dev/null || :
 
 
 %changelog
+* Thu Jan 21 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.11-0.1.beta
+- Upgrade to 1.3.11-beta.
+
 * Thu Jan 21 2010 Michael Schwendt <mschwendt@fedoraproject.org> - 1.3.10-0.4.beta
 - Add audio/x-flac to .desktop file (#557335).
 - Create fresh .desktop file patch. Enable startup notification.
diff --git a/sources b/sources
index 8ed93da..8383fa9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-ffa698188e2e8f48c499268a478c579c  audacity-minsrc-1.3.10.tar.bz2
+a52b30d386b29c19be23cc4eee66c4e5  audacity-minsrc-1.3.11-beta.tar.bz2