From e5dfd82d33e6164997bc643420fedcfb9187ce56 Mon Sep 17 00:00:00 2001
From: Matt Firth <matt.firth@bbc.co.uk>
Date: Tue, 14 Sep 2021 16:47:25 +0100
Subject: [PATCH] Minor changes to bring HOA inline with EBU PR #114

---
 .../plugins/hoa/src/hoa_frontend_connector.cpp      | 13 +++++++------
 .../plugins/hoa/src/hoa_plugin_editor.cpp           | 10 +++++++---
 .../plugins/hoa/src/value_box_main.hpp              |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/ear-production-suite-plugins/plugins/hoa/src/hoa_frontend_connector.cpp b/ear-production-suite-plugins/plugins/hoa/src/hoa_frontend_connector.cpp
index 88c700528..baf2e8d1d 100644
--- a/ear-production-suite-plugins/plugins/hoa/src/hoa_frontend_connector.cpp
+++ b/ear-production-suite-plugins/plugins/hoa/src/hoa_frontend_connector.cpp
@@ -4,6 +4,12 @@
 #include "components/ear_combo_box.hpp"
 #include "components/ear_name_text_editor.hpp"
 
+namespace {
+  String routingLayoutDescriptionAt(int position, int layoutSizeFixed) {
+    return String(position) + String::fromUTF8("-") + String(position + layoutSizeFixed);
+  }
+}
+
 namespace ear {
 namespace plugin {
 namespace ui {
@@ -154,12 +160,7 @@ void HoaJuceFrontendConnector::setHoaType(int hoaType) {  // 2nd here the value
     routingComboBoxLocked->clearEntries();
     auto cfCountFixed = cfCount != 0 ? cfCount - 1 : cfCount;
     for (int i = 1; i + cfCountFixed <= 64; ++i) {
-      if(cfCount > 1) {
-        routingComboBoxLocked->addTextEntry(String(i) + String::fromUTF8("–") +
-                                            String(i + cfCountFixed));
-      } else {
-        routingComboBoxLocked->addTextEntry(String(i));
-      }
+      routingComboBoxLocked->addTextEntry(routingLayoutDescriptionAt(i, cfCountFixed));
     }
     routingComboBoxLocked->selectEntry(cachedRouting_, sendNotification);
   }
diff --git a/ear-production-suite-plugins/plugins/hoa/src/hoa_plugin_editor.cpp b/ear-production-suite-plugins/plugins/hoa/src/hoa_plugin_editor.cpp
index c90f98218..73997d288 100644
--- a/ear-production-suite-plugins/plugins/hoa/src/hoa_plugin_editor.cpp
+++ b/ear-production-suite-plugins/plugins/hoa/src/hoa_plugin_editor.cpp
@@ -7,6 +7,10 @@
 #include "hoa_plugin_processor.hpp"
 #include "hoa_frontend_connector.hpp"
 
+namespace{
+  const int desiredWidth{ 750 };
+  const int desiredHeight{ 930 };
+}
 
 using namespace ear::plugin::ui;
 
@@ -53,8 +57,8 @@ HoaAudioProcessorEditor::HoaAudioProcessorEditor(//this is the constructor, 2..
   addAndMakeVisible(viewport_.get());
 
   setResizable(true, false);
-  setResizeLimits(0, 0, 750, 930);
-  setSize(750, 930);
+  setResizeLimits(0, 0, desiredWidth, desiredHeight);
+  setSize(desiredWidth, desiredHeight);
 
   //ME add
   /* auto elementRelationships =
@@ -80,5 +84,5 @@ void HoaAudioProcessorEditor::paint(Graphics& g) {}
 
 void HoaAudioProcessorEditor::resized() {
   viewport_->setBounds(getLocalBounds());
-  content_->setBounds(0, 0, 750, 930);
+  content_->setBounds(0, 0, desiredWidth, desiredHeight);
 }
diff --git a/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp
index 870681897..470c1bf24 100644
--- a/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp
+++ b/ear-production-suite-plugins/plugins/hoa/src/value_box_main.hpp
@@ -60,7 +60,7 @@ class ValueBoxMain : public Component {
       }
     }
 
-    hoaTypeComboBox_->setDefaultText("Enter HOA Type");
+    hoaTypeComboBox_->setDefaultText("Select HOA Type");
     addAndMakeVisible(hoaTypeComboBox_.get());
 
     /* commonDefinitionComboBoxPopup_->setName("HOA type box popup");