[SCM] audacity/master: Drop backported patches.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Thu Dec 22 22:50:32 UTC 2011
The following commit has been merged in the master branch:
commit 75e732a12da7f0b6574da781fbe8005a2902f188
Author: Benjamin Drung <bdrung at debian.org>
Date: Thu Dec 22 22:53:43 2011 +0100
Drop backported patches.
diff --git a/debian/patches/series b/debian/patches/series
index 65e5970..25a2eb8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,3 @@
-upstream-bug-137.patch
-upstream-bug-350.patch
-upstream-bug-367.patch
disable-dynamic-ffmpeg.patch
disable-dynamic-lame.patch
libav-0.7.patch
diff --git a/debian/patches/upstream-bug-137.patch b/debian/patches/upstream-bug-137.patch
deleted file mode 100644
index dbd6881..0000000
--- a/debian/patches/upstream-bug-137.patch
+++ /dev/null
@@ -1,97 +0,0 @@
-Description: Bug 137 (P2) - fix false positive detection of orphaned files that
- belong to the clipboard (triggered by cut commands)
-Origin: upstream, http://code.google.com/p/audacity/source/detail?r=11118
-
---- a/src/Project.h
-+++ b/src/Project.h
-@@ -275,7 +275,7 @@
- void UpdateLayout();
-
- // Other commands
--
-+ static TrackList *GetClipboardTracks();
- static void DeleteClipboard();
- static void DeleteAllProjectsDeleteLock();
-
---- a/src/DirManager.h
-+++ b/src/DirManager.h
-@@ -70,8 +70,10 @@
- BlockFile *NewODDecodeBlockFile( wxString aliasedFile, sampleCount aliasStart,
- sampleCount aliasLen, int aliasChannel, int decodeType);
-
-- /// Returns true if the blockfile is contained by the DirManager
-+ /// Returns true if the blockfile pointed to by b is contained by the DirManager
- bool ContainsBlockFile(BlockFile *b);
-+ /// Check for existing using filename using complete filename
-+ bool ContainsBlockFile(wxString filepath);
-
- // Adds one to the reference count of the block file,
- // UNLESS it is "locked", then it makes a new copy of
---- a/src/DirManager.cpp
-+++ b/src/DirManager.cpp
-@@ -910,11 +910,17 @@
- return newBlockFile;
- }
-
--bool DirManager::ContainsBlockFile(BlockFile *b) {
-- // check what the hash returns in case the blockfile is from a different project
-+bool DirManager::ContainsBlockFile(BlockFile *b)
-+{
- return b ? mBlockFileHash[b->GetFileName().GetName()] == b : NULL;
- }
-
-+bool DirManager::ContainsBlockFile(wxString filepath)
-+{
-+ // check what the hash returns in case the blockfile is from a different project
-+ return mBlockFileHash[filepath] != NULL;
-+}
-+
- // Adds one to the reference count of the block file,
- // UNLESS it is "locked", then it makes a new copy of
- // the BlockFile.
-@@ -1695,6 +1701,8 @@
- const wxArrayString& filePathArray, // input: all files in project directory
- wxArrayString& orphanFilePathArray) // output: orphan files
- {
-+ DirManager *clipboardDM = NULL;
-+
- for (size_t i = 0; i < filePathArray.GetCount(); i++)
- {
- wxFileName fullname = filePathArray[i];
-@@ -1705,7 +1713,20 @@
- (fullname.GetExt().IsSameAs(wxT("au")) ||
- fullname.GetExt().IsSameAs(wxT("auf"))))
- {
-- orphanFilePathArray.Add(fullname.GetFullPath());
-+ if (!clipboardDM) {
-+ TrackList *clipTracks = AudacityProject::GetClipboardTracks();
-+
-+ if (clipTracks) {
-+ TrackListIterator clipIter(clipTracks);
-+ Track *track = clipIter.First();
-+ if (track)
-+ clipboardDM = track->GetDirManager();
-+ }
-+ }
-+
-+ // Ignore it if it exists in the clipboard (from a previously closed project)
-+ if (clipboardDM && clipboardDM->ContainsBlockFile(fullname.GetFullPath()))
-+ orphanFilePathArray.Add(fullname.GetFullPath());
- }
- }
- for (size_t i = 0; i < orphanFilePathArray.GetCount(); i++)
---- a/src/Project.cpp
-+++ b/src/Project.cpp
-@@ -3728,6 +3728,12 @@
- //
-
- //static
-+TrackList *AudacityProject::GetClipboardTracks()
-+{
-+ return msClipboard;
-+}
-+
-+//static
- void AudacityProject::DeleteClipboard()
- {
- if (msClipboard) {
diff --git a/debian/patches/upstream-bug-350.patch b/debian/patches/upstream-bug-350.patch
deleted file mode 100644
index 27a0e34..0000000
--- a/debian/patches/upstream-bug-350.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-Description: Bug 350 (P2) - Restore focus to TrackPanel when play/rec is hit and
- the focus is in the device toolbar.
-Origin: upstream, http://code.google.com/p/audacity/source/detail?r=11101
-
---- a/src/toolbars/DeviceToolBar.cpp
-+++ b/src/toolbars/DeviceToolBar.cpp
-@@ -324,6 +324,18 @@
- if (gAudioIO) {
- // we allow changes when monitoring, but not when recording
- bool audioStreamActive = gAudioIO->IsStreamActive() && !gAudioIO->IsMonitoring();
-+
-+ // Here we should relinquish focus
-+ if (audioStreamActive) {
-+ wxWindow *focus = wxWindow::FindFocus();
-+ if (focus == mHost || focus == mInput || focus == mOutput || focus == mInputChannels) {
-+ AudacityProject *activeProject = GetActiveProject();
-+ if (activeProject) {
-+ activeProject->GetTrackPanel()->SetFocus();
-+ }
-+ }
-+ }
-+
- mHost->Enable(!audioStreamActive);
- mInput->Enable(!audioStreamActive);
- mOutput->Enable(!audioStreamActive);
diff --git a/debian/patches/upstream-bug-367.patch b/debian/patches/upstream-bug-367.patch
deleted file mode 100644
index 923a23b..0000000
--- a/debian/patches/upstream-bug-367.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-Description: Bug 367 (P2) - fix crash when sliding tracks vertically using sync
- lock. This patch contains the commits 11110, 11114, and 11116.
-Origin: upstream, http://code.google.com/p/audacity/source/detail?r=11110
-
---- a/src/TrackPanel.cpp
-+++ b/src/TrackPanel.cpp
-@@ -7564,6 +7564,28 @@
- return false;
-
- if (clip2) {
-+ // linking can cause pairs of mono tracks to get here.
-+ // allow this case (both these won't have links)
-+ if ((!src2 && !dst2) && (dst2 || src2))
-+ return false;
-+
-+ if (!src2) {
-+ // if we are copying two mono linked tracks we have to ask for it differently
-+ src2 = (WaveTrack*)mTracks->GetNext(src, false);
-+ if (src2 && src2->GetKind() != Track::Wave)
-+ src2 = NULL;
-+ }
-+ if (!dst2) {
-+ dst2 = (WaveTrack*)mTracks->GetNext(dst, false);
-+ if (dst2 && dst2->GetKind() != Track::Wave)
-+ dst2 = NULL;
-+ }
-+
-+ // we should have a source and dest track
-+ if (!dst2 || !src2)
-+ return false;
-+
-+
- if (!dst2->CanInsertClip(clip2))
- return false;
- }
-@@ -7572,13 +7594,20 @@
- if (src2)
- src2->MoveClipToTrack(clip2, dst2);
-
-+ // If sync-lock is on then one of the mCapturedClipArray indexes may be a labeltrack.
-+ // This means that we are not really copying a stereo track and cannot assume dst2 exists.
-+ // If we found a src2 is the best indicator of whether or not it is stereo.
-+ // This assumes that the first captured tracks will be WaveTracks - I believe this is the case
-+ // from whats generated in StartSlide()
- if (mCapturedClipArray.GetCount() == 2) {
- if (mCapturedClipArray[0].clip == clip) {
- mCapturedClipArray[0].track = dst;
-- mCapturedClipArray[1].track = dst2;
-+ if (src2)
-+ mCapturedClipArray[1].track = dst2;
- }
- else {
-- mCapturedClipArray[0].track = dst2;
-+ if (src2)
-+ mCapturedClipArray[0].track = dst2;
- mCapturedClipArray[1].track = dst;
- }
- }
---- a/src/Track.cpp
-+++ b/src/Track.cpp
-@@ -831,6 +831,7 @@
- return NULL;
- }
-
-+/// Return a track in the list that comes after Track t
- Track *TrackList::GetNext(Track * t, bool linked) const
- {
- if (t) {
---- a/src/Track.h
-+++ b/src/Track.h
-@@ -354,6 +354,11 @@
- Track *GetLink(Track * t) const;
-
- Track *GetPrev(Track * t, bool linked = false) const;
-+
-+ /** Return a track in the list that comes after Track t
-+ * @param t a track in the list
-+ * @param linked if true, skips over linked tracks, if false returns the next track even if it is a linked track
-+ **/
- Track *GetNext(Track * t, bool linked = false) const;
- int GetGroupHeight(Track * t) const;
-
--
Audacity debian packaging
More information about the pkg-multimedia-commits
mailing list