From 3f4a9191ec6cbd6730ff9791a6d2869f6a60ac5e Mon Sep 17 00:00:00 2001
From: James Crook <james.k.crook@gmail.com>
Date: Mon, 8 Feb 2016 21:47:59 +0000
Subject: [PATCH 1/2] __WXMAC__ -> __APPLE__ in Theme.cpp #ifdef

This change helps macports and is (apparently) neutral for the platforms we build for.  See:
https://trac.macports.org/ticket/47189#comment:35
---
 src/Theme.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Theme.cpp b/src/Theme.cpp
index 88f2aabfd..f7b47b58e 100644
--- a/src/Theme.cpp
+++ b/src/Theme.cpp
@@ -383,7 +383,7 @@ void ThemeBase::RegisterImage( int &iIndex, const wxImage &Image, const wxString
    wxASSERT( iIndex == -1 ); // Don't initialise same bitmap twice!
    mImages.Add( Image );
 
-#ifdef __WXMAC__
+#ifdef __APPLE__
    // On Mac, bitmaps with alpha don't work.
    // So we convert to a mask and use that.
    // It isn't quite as good, as alpha gives smoother edges.

From 5f76da4f5ba25f381f78622edfa0824fa002ecfd Mon Sep 17 00:00:00 2001
From: Paul Licameli <paul.licameli@gmail.com>
Date: Thu, 11 Feb 2016 12:01:42 -0500
Subject: [PATCH 2/2] Bug1321 (partial): Don't change output balance when
 closing Preferences unless...

... you really changed Device preferences.
---
 src/AudioIO.cpp | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
index 798438c97..f5d613bd5 100644
--- a/src/AudioIO.cpp
+++ b/src/AudioIO.cpp
@@ -1107,8 +1107,13 @@ void AudioIO::HandleDeviceChange()
       return;
 
    // get the selected record and playback devices
-   int playDeviceNum = getPlayDevIndex();
-   int recDeviceNum = getRecordDevIndex();
+   const int playDeviceNum = getPlayDevIndex();
+   const int recDeviceNum = getRecordDevIndex();
+
+   // If no change needed, return
+   if (mCachedPlaybackIndex == playDeviceNum &&
+       mCachedCaptureIndex == recDeviceNum)
+       return;
 
    // cache playback/capture rates
    mCachedPlaybackRates = GetSupportedPlaybackRates(playDeviceNum);