From 71bc0ca7e69bdae395dc66abdff7886bc255d683 Mon Sep 17 00:00:00 2001
From: Tom Poole <thomas.poole@roli.com>
Date: Fri, 22 Dec 2017 09:47:37 +0000
Subject: [PATCH] Code cleanup

---
 .../Standalone/juce_StandaloneFilterWindow.h  | 24 ++++++++-----------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
index 511287113c..ddd5076ad8 100644
--- a/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
+++ b/modules/juce_audio_plugin_client/Standalone/juce_StandaloneFilterWindow.h
@@ -250,28 +250,24 @@ public:
         int minNumInputs  = std::numeric_limits<int>::max(), maxNumInputs  = 0,
             minNumOutputs = std::numeric_limits<int>::max(), maxNumOutputs = 0;
 
+        auto updateMinAndMax = [] (int newValue, int& minValue, int& maxValue)
+        {
+            minValue = jmin (minValue, newValue);
+            maxValue = jmax (maxValue, newValue);
+        };
+
         if (channelConfiguration.size() > 0)
         {
             auto defaultConfig = channelConfiguration.getReference (0);
-            minNumInputs  = jmin (minNumInputs,  (int) defaultConfig.numIns);
-            maxNumInputs  = jmax (maxNumInputs,  (int) defaultConfig.numIns);
-            minNumOutputs = jmin (minNumOutputs, (int) defaultConfig.numOuts);
-            maxNumOutputs = jmax (maxNumOutputs, (int) defaultConfig.numOuts);
+            updateMinAndMax ((int) defaultConfig.numIns,  minNumInputs,  maxNumInputs);
+            updateMinAndMax ((int) defaultConfig.numOuts, minNumOutputs, maxNumOutputs);
         }
 
         if (auto* bus = processor->getBus (true, 0))
-        {
-            auto defaultNumChannels = bus->getDefaultLayout().size();
-            minNumInputs = jmin (minNumInputs, defaultNumChannels);
-            maxNumInputs = jmax (maxNumInputs, defaultNumChannels);
-        }
+            updateMinAndMax (bus->getDefaultLayout().size(), minNumInputs, maxNumInputs);
 
         if (auto* bus = processor->getBus (false, 0))
-        {
-            auto defaultNumChannels = bus->getDefaultLayout().size();
-            minNumOutputs = jmin (minNumOutputs, defaultNumChannels);
-            maxNumOutputs = jmax (maxNumOutputs, defaultNumChannels);
-        }
+            updateMinAndMax (bus->getDefaultLayout().size(), minNumOutputs, maxNumOutputs);
 
         minNumInputs  = jmin (minNumInputs,  maxNumInputs);
         minNumOutputs = jmin (minNumOutputs, maxNumOutputs);