[SCM] audacity/master: Apply two upstream fixes for the upstream bugs #350 and #367.

[bdrung at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 686500cfa284ddba09a6a3307a841f0f3409a918
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Sun Apr 17 18:25:35 2011 +0200

    Apply two upstream fixes for the upstream bugs #350 and #367.

diff --git a/debian/patches/series b/debian/patches/series
index ceadbe1..b7697f6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,4 @@
 disable-dynamic-ffmpeg.patch
 disable-dynamic-lame.patch
+upstream-bug-350.patch
+upstream-bug-367.patch
diff --git a/debian/patches/upstream-bug-350.patch b/debian/patches/upstream-bug-350.patch
new file mode 100644
index 0000000..27a0e34
--- /dev/null
+++ b/debian/patches/upstream-bug-350.patch
@@ -0,0 +1,25 @@
+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
new file mode 100644
index 0000000..07e38bf
--- /dev/null
+++ b/debian/patches/upstream-bug-367.patch
@@ -0,0 +1,29 @@
+Description: Bug 367 (P2) - fix crash when sliding tracks vertically using sync
+ lock.
+Origin: upstream, http://code.google.com/p/audacity/source/detail?r=11110
+
+--- a/src/TrackPanel.cpp
++++ b/src/TrackPanel.cpp
+@@ -7572,13 +7572,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;
+       }
+    }

-- 
Audacity debian packaging