Enforce use of AdmPresetDefinitionsHelper as singleton using reference

ebu · Feb 29, 2024 · 5567fd2 · 5567fd2
1 parent c16a1ae
commit 5567fd2
Show file tree

Hide file tree

Showing 30 changed files with 76 additions and 88 deletions.
diff --git a/ear-production-suite-plugins/lib/include/binaural_monitoring_backend.hpp b/ear-production-suite-plugins/lib/include/binaural_monitoring_backend.hpp
@@ -6,7 +6,6 @@
 #include "ear-plugin-base/export.h"
 #include "scene_gains_calculator.hpp"
 #include "listener_orientation.hpp"
-#include "helper/adm_preset_definitions_helper.h"
 
 #include <string>
 #include <memory>
@@ -103,9 +102,6 @@ class BinauralMonitoringBackend {
   std::unique_ptr<communication::MonitoringMetadataReceiver> metadataReceiver_;
   communication::MonitoringControlConnection controlConnection_;
 
-  std::mutex commonDefinitionHelperMutex_;
-  AdmPresetDefinitionsHelper commonDefinitionHelper{};
-
   bool isExporting_{ false };
 };
 

diff --git a/ear-production-suite-plugins/lib/include/helper/eps_to_ear_metadata_converter.hpp b/ear-production-suite-plugins/lib/include/helper/eps_to_ear_metadata_converter.hpp
@@ -3,6 +3,7 @@
 #include "helper/protobuf_utilities.hpp"
 #include "helper/adm_preset_definitions_helper.h"
 #include <string>
+#include <memory>
 #include <adm/detail/id_parser.hpp>
 
 namespace ear {
@@ -54,11 +55,9 @@ struct EpsToEarMetadataConverter {
     return earMetadata;
   }
   static ear::HOATypeMetadata convert(
-      const proto::HoaTypeMetadata &epsMetadata,
-      AdmPresetDefinitionsHelper &commonDefinitionHelper) {
-    auto pfData = commonDefinitionHelper.getPackFormatData(
+      const proto::HoaTypeMetadata &epsMetadata) {
+    auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
         4, epsMetadata.packformatidvalue());
-
     ear::HOATypeMetadata earMetadata;
 
     if (pfData) {

diff --git a/ear-production-suite-plugins/lib/include/scene_gains_calculator.hpp b/ear-production-suite-plugins/lib/include/scene_gains_calculator.hpp
@@ -9,7 +9,6 @@
 #include <map>
 #include <string>
 #include <vector>
-#include "helper/adm_preset_definitions_helper.h"
 
 namespace ear {
 namespace plugin {
@@ -44,9 +43,6 @@ class SceneGainsCalculator {
   ear::GainCalculatorHOA hoaCalculator_;
 
   std::map<communication::ConnectionId, ItemGains> routingCache_;
-
-  std::mutex commonDefinitionHelperMutex_;
-  AdmPresetDefinitionsHelper commonDefinitionHelper_{};
 };
 
 }  // namespace plugin

diff --git a/ear-production-suite-plugins/lib/src/binaural_monitoring_backend.cpp b/ear-production-suite-plugins/lib/src/binaural_monitoring_backend.cpp
@@ -150,15 +150,12 @@ BinauralMonitoringBackend::getLatestHoaTypeMetadata(ConnId id) {
   if (!epsMD || !epsMD->has_hoa_metadata()) {
     return std::optional<HoaEarMetadataAndRouting>();
   }
-  {
-    std::lock_guard<std::mutex> lock(commonDefinitionHelperMutex_);
-    setInMap<ConnId, HoaEarMetadataAndRouting>(
-        latestHoaTypeMetadata, id,
-        HoaEarMetadataAndRouting{
-            epsMD->has_routing() ? epsMD->routing() : -1,
-            EpsToEarMetadataConverter::convert(epsMD->hoa_metadata(),
-                                               commonDefinitionHelper)});
-  }
+
+  setInMap<ConnId, HoaEarMetadataAndRouting>(
+      latestHoaTypeMetadata, id,
+      HoaEarMetadataAndRouting{
+          epsMD->has_routing() ? epsMD->routing() : -1,
+          EpsToEarMetadataConverter::convert(epsMD->hoa_metadata())});
 
   earMD = getValuePointerFromMap<ConnId, HoaEarMetadataAndRouting>(
       latestHoaTypeMetadata, id);
@@ -226,15 +223,14 @@ void BinauralMonitoringBackend::onSceneReceived(proto::SceneStore store) {
     }
     if (item.has_hoa_metadata()) {
       auto hoaId = item.hoa_metadata().packformatidvalue();
-      {
-        std::lock_guard<std::mutex> lock(commonDefinitionHelperMutex_);
-        // TODO: May need to revisit later -
-        //       this is a high-frequency call but may be slow to to execute
-        auto pfData = commonDefinitionHelper.getPackFormatData(4, hoaId);
-        if (pfData) {
-          auto cfCount = pfData->relatedChannelFormats.size();
-          totalHoaChannels += cfCount;
-        }
+      // TODO: May need to revisit later -
+      //       this is a high-frequency call but may be slow to to execute
+      auto pfData =
+          AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(4,
+                                                                       hoaId);
+      if (pfData) {
+        auto cfCount = pfData->relatedChannelFormats.size();
+        totalHoaChannels += cfCount;
       }
     }
   }

diff --git a/ear-production-suite-plugins/lib/src/helper/protobuf_utilities.cpp b/ear-production-suite-plugins/lib/src/helper/protobuf_utilities.cpp
@@ -8,12 +8,11 @@ namespace proto {
 
 proto::DirectSpeakersTypeMetadata* convertPackFormatToEpsMetadata(
     int packFormatIdValue) {
-  auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-
   auto ds_metadata = new proto::DirectSpeakersTypeMetadata();
   ds_metadata->set_packformatidvalue(packFormatIdValue);
 
-  auto pfData = commonDefinitionHelper->getPackFormatData(1, packFormatIdValue);
+  auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
+      1, packFormatIdValue);
   if (pfData) {
     for (auto const& cfData : pfData->relatedChannelFormats) {
       auto newSpeaker = ds_metadata->add_speakers();

diff --git a/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp b/ear-production-suite-plugins/lib/src/programme_store_adm_serializer.cpp
@@ -387,10 +387,10 @@ void ProgrammeStoreAdmSerializer::createTopLevelObject(
             adm::TypeDefinition::HOA,
             adm::AudioPackFormatIdValue(
                 metadata.hoa_metadata().packformatidvalue()));
-       }
+      }
 
-      auto presets = AdmPresetDefinitionsHelper::getSingleton();
-      auto objectHolder = presets->addPresetDefinitionObjectTo(
+      auto objectHolder = AdmPresetDefinitionsHelper::getSingleton()
+                               .addPresetDefinitionObjectTo(
             doc, metadata.name(), audioPackFormatID);
       setInteractivity(*objectHolder.audioObject, object);
       setImportance(*objectHolder.audioObject, object);

diff --git a/ear-production-suite-plugins/lib/src/scene_gains_calculator.cpp b/ear-production-suite-plugins/lib/src/scene_gains_calculator.cpp
@@ -151,10 +151,7 @@ void SceneGainsCalculator::addOrUpdateItem(const proto::MonitoringItemMetadata &
 
   if(item.has_hoa_metadata()) {
     ear::HOATypeMetadata earMetadata;
-    {
-      std::lock_guard<std::mutex> lock(commonDefinitionHelperMutex_);
-      earMetadata = EpsToEarMetadataConverter::convert(item.hoa_metadata(), commonDefinitionHelper_);
-    }
+    earMetadata = EpsToEarMetadataConverter::convert(item.hoa_metadata());
     routing->inputStartingChannel = item.routing();
     int inputChannelCount = static_cast<int>(earMetadata.degrees.size());
     resizeGainTables(*routing, inputChannelCount, totalOutputChannels);

diff --git a/ear-production-suite-plugins/plugins/direct_speakers/src/channel_meter_layout.hpp b/ear-production-suite-plugins/plugins/direct_speakers/src/channel_meter_layout.hpp
@@ -95,7 +95,7 @@ class ChannelMeterLayout : public Component {
   void setSpeakerSetupPackFormat(int pfId) {
     clearSpeakerSetup();
     auto pfData =
-        AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(1, pfId);
+        AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(1, pfId);
     if (pfData) {
       for (int i = 0; i < pfData->relatedChannelFormats.size(); ++i) {
         auto cfData = pfData->relatedChannelFormats[i];

diff --git a/...oduction-suite-plugins/plugins/direct_speakers/src/direct_speakers_frontend_connector.cpp b/...oduction-suite-plugins/plugins/direct_speakers/src/direct_speakers_frontend_connector.cpp
@@ -182,7 +182,7 @@ void DirectSpeakersJuceFrontendConnector::setSpeakerSetupPackFormat(
   if (auto speakerSetupsComboBoxLocked = speakerSetupsComboBox_.lock())
     speakerSetupsComboBoxLocked->setSelectedId(speakerSetupPackFormatIdValue,
                                              dontSendNotification);
-  auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(
+  auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
       1, cachedPackFormatId_);
   if (auto routingComboBoxLocked = routingComboBox_.lock()) {
     int layoutSize = pfData ? pfData->relatedChannelFormats.size() : 0;

diff --git a/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp b/ear-production-suite-plugins/plugins/direct_speakers/src/value_box_main.hpp
@@ -56,7 +56,7 @@ class ValueBoxMain : public Component {
     addAndMakeVisible(speakerSetupLabel_.get());
     speakerSetupsComboBox_->setDefaultText("Select speaker layout");
 
-    auto tdData = AdmPresetDefinitionsHelper::getSingleton()->getTypeDefinitionData(1);
+    auto tdData = AdmPresetDefinitionsHelper::getSingleton().getTypeDefinitionData(1);
     auto pfDatas = tdData->relatedPackFormats;
     std::stable_sort(
         pfDatas.begin(), pfDatas.end(),

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
@@ -168,7 +168,7 @@ void HoaJuceFrontendConnector::setHoaType(int hoaType) {
 
   auto packFormatIdValue = p_->getPackFormatIdValue()->get();
   if (auto routingComboBoxLocked = routingComboBox_.lock()) {
-    auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(
+    auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
         4, packFormatIdValue);
     size_t cfCount{0};
 

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
@@ -60,8 +60,9 @@ class ValueBoxMain : public Component {
     hoaTypeLabel_->setJustificationType(Justification::right);
     addAndMakeVisible(hoaTypeLabel_.get());
 
-    auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-    for (auto const& pfData : commonDefinitionHelper->getTypeDefinitionData(4)->relatedPackFormats) {
+    auto& admPresetDefinitions = AdmPresetDefinitionsHelper::getSingleton();
+    for (auto const& pfData :
+         admPresetDefinitions.getTypeDefinitionData(4)->relatedPackFormats) {
       auto entry = hoaTypeComboBox_->addTextEntry(pfData->niceName, pfData->idValue);
       entry->setLightFont(!pfData->isCommonDefinition());
     }

diff --git a/ear-production-suite-plugins/plugins/hoa/src/value_box_order_display.cpp b/ear-production-suite-plugins/plugins/hoa/src/value_box_order_display.cpp
@@ -75,8 +75,8 @@ void ValueBoxOrderDisplay::clearHoaSetup() {
 
 void ValueBoxOrderDisplay::setHoaType(int hoaId) {
   clearHoaSetup();
-  auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-  auto pfData = commonDefinitionHelper->getPackFormatData(4, hoaId);
+  auto pfData =
+      AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(4, hoaId);
   size_t cfCount(0);
   if (pfData) {
     cfCount = static_cast<size_t>(pfData->relatedChannelFormats.size());

diff --git a/ear-production-suite-plugins/plugins/monitoring/src/monitoring_plugin_editor.cpp b/ear-production-suite-plugins/plugins/monitoring/src/monitoring_plugin_editor.cpp
@@ -67,7 +67,7 @@ EarMonitoringAudioProcessorEditor::EarMonitoringAudioProcessorEditor(
   auto apfid = adm::parseAudioPackFormatId(AUDIO_PACK_FORMAT_ID);
   auto idValue = apfid.get<adm::AudioPackFormatIdValue>().get();
   auto typeDef = apfid.get<adm::TypeDescriptor>().get();
-  auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(
+  auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
       typeDef, idValue);
   if (pfData) {
     for (int i = 0; i < pfData->relatedChannelFormats.size(); ++i) {

diff --git a/ear-production-suite-plugins/plugins/scene/src/object_view.hpp b/ear-production-suite-plugins/plugins/scene/src/object_view.hpp
@@ -224,16 +224,16 @@ class ObjectView : public ElementView,
     juce::String metadataLabelText;
     if (data_.item.has_ds_metadata()) {
       metadataLabelText = "DirectSpeakers";
-      auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-      auto pfData = commonDefinitionHelper->getPackFormatData(
+      auto pfData =
+          AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
         1, data_.item.ds_metadata().packformatidvalue());
       if (pfData) {
         metadataLabelText = pfData->niceName;
       }
     } else if (data_.item.has_hoa_metadata()) {
       metadataLabelText = "HOA";
-      auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-      auto pfData = commonDefinitionHelper->getPackFormatData(
+      auto pfData =
+          AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
         4, data_.item.hoa_metadata().packformatidvalue());
       if (pfData) {
         int cfCount = pfData->relatedChannelFormats.size();

diff --git a/ear-production-suite-plugins/plugins/scene/src/programmes_container.cpp b/ear-production-suite-plugins/plugins/scene/src/programmes_container.cpp
@@ -288,9 +288,9 @@ void ear::plugin::ui::ProgrammesContainer::updateMeter(const proto::InputItemMet
        oldItem.hoa_metadata().packformatidvalue() != item.hoa_metadata().packformatidvalue()) {
       auto packFormatId = item.hoa_metadata().packformatidvalue();
       if(packFormatId >= 0) {
-        auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
         auto pfData =
-          commonDefinitionHelper->getPackFormatData(4, packFormatId);
+            AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(
+                4, packFormatId);
         if(pfData) {
           updateRequired = true;
           channelCount =

diff --git a/ear-production-suite-plugins/test/programme_store_adm_serializer_tests.cpp b/ear-production-suite-plugins/test/programme_store_adm_serializer_tests.cpp
@@ -78,8 +78,9 @@ class ItemBuilder {
     ItemBuilder& withDsPackFormat(int pfId) {
       auto dsMeta = metadata_.mutable_ds_metadata();
       dsMeta->set_packformatidvalue(pfId);
-      auto commonDefinitionHelper = AdmPresetDefinitionsHelper::getSingleton();
-      auto pfData = commonDefinitionHelper->getPackFormatData(1, pfId);
+      auto pfData =
+          AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(1,
+                                                                        pfId);
       if (pfData) {
         for (auto const& cfData : pfData->relatedChannelFormats) {
           auto newSpeaker = dsMeta->add_speakers();

diff --git a/reaper-adm-export-source-plugin/src/PluginEditor.cpp b/reaper-adm-export-source-plugin/src/PluginEditor.cpp
@@ -1,7 +1,7 @@
 #include "PluginEditor.h"
 #include "PluginProcessor.h"
-#include "components/version_label.hpp"
-
+#include <components/version_label.hpp>
+#include <helper/adm_preset_definitions_helper.h>
 #include <chrono>
 
 using namespace ear::plugin::ui;
@@ -54,7 +54,7 @@ AdmStemPluginAudioProcessorEditor::AdmStemPluginAudioProcessorEditor (AdmStemPlu
     channelFormatLabel.setJustificationType(Justification::right);
     addAndMakeVisible(channelFormatLabel);
 
-    auto elementRelationships = processor.admPresetDefinitions.getElementRelationships();
+    auto elementRelationships = AdmPresetDefinitionsHelper::getSingleton().getElementRelationships();
 
     for(auto const& tdData : elementRelationships) {
         typeDefinitionSelector.addTextEntry(tdData->name, tdData->id);
@@ -175,7 +175,7 @@ void AdmStemPluginAudioProcessorEditor::updateComboBoxOptions(int tdId, int pfId
         channelFormatSelector.setDefaultText("Select Pack Format");
     }
 
-    auto typeDefinitionData = processor.admPresetDefinitions.getTypeDefinitionData(tdId);
+    auto typeDefinitionData = AdmPresetDefinitionsHelper::getSingleton().getTypeDefinitionData(tdId);
 
     if(typeDefinitionData) {
         for(auto& pfData : typeDefinitionData->relatedPackFormats) {

diff --git a/reaper-adm-export-source-plugin/src/PluginProcessor.cpp b/reaper-adm-export-source-plugin/src/PluginProcessor.cpp
@@ -2,6 +2,7 @@
 #include "PluginProcessor.h"
 #include <fstream>
 #include <daw_channel_count.h>
+#include <helper/adm_preset_definitions_helper.h>
 
 AdmStemPluginAudioProcessor::AdmStemPluginAudioProcessor()
 #ifndef JucePlugin_PreferredChannelConfigurations
@@ -209,6 +210,7 @@ int AdmStemPluginAudioProcessor::calcNumChannels()
     auto selPf = admPackFormatParam->get();
     auto selCf = admChannelFormatParam->get();
 
+    auto& admPresetDefinitions = AdmPresetDefinitionsHelper::getSingleton();
     auto packFormatData = admPresetDefinitions.getPackFormatData(selTd, selPf);
     if(!packFormatData) return 0;
 
@@ -235,6 +237,7 @@ void AdmStemPluginAudioProcessor::updateAdmParameters(bool force)
     int valTypeDefinition = desiredTypeDefinition;
     int valPackFormat = PACKFORMAT_UNSET_ID;
     int valChannelFormat = CHANNELFORMAT_ALLCHANNELS_ID;
+    auto& admPresetDefinitions = AdmPresetDefinitionsHelper::getSingleton();
 
     if(admPresetDefinitions.getPackFormatData(valTypeDefinition, desiredPackFormat)) {
         valPackFormat = desiredPackFormat;

diff --git a/reaper-adm-export-source-plugin/src/PluginProcessor.h b/reaper-adm-export-source-plugin/src/PluginProcessor.h
@@ -12,7 +12,6 @@
 
 #include "helper/nng_wrappers.h"
 #include "JuceHeader_Wrapper.h"
-#include "helper/adm_preset_definitions_helper.h"
 #include "PluginProcessorUtils.h"
 #include <functional>
 #include <memory>
@@ -80,8 +79,6 @@ class AdmStemPluginAudioProcessor  : public AudioProcessor
 
     void incomingMessage(std::shared_ptr<NngMsg> msg);
 
-    AdmPresetDefinitionsHelper admPresetDefinitions{};
-
 private:
     AdmStemPluginAudioProcessorEditor* editor();
 

diff --git a/reaper-adm-extension/src/reaper_adm/admvstcontrol.cpp b/reaper-adm-extension/src/reaper_adm/admvstcontrol.cpp
@@ -149,7 +149,7 @@ bool AdmVst::isUsingPresetDefinition()
 {
     auto td = getAdmTypeDefinition();
     auto pfId = getAdmPackFormat();
-    auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(td, pfId);
+    auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(td, pfId);
     return pfData != nullptr;
 }
 

diff --git a/reaper-adm-extension/src/reaper_adm/exportaction_admsource-admvst.cpp b/reaper-adm-extension/src/reaper_adm/exportaction_admsource-admvst.cpp
@@ -413,15 +413,15 @@ void AdmVstExporter::newAdmPresetDefinitionReference(ReaperAPI const& api, std::
 	int channelFormatIdValue = admExportVst->getAdmChannelFormat();
 	assert(packFormatIdValue != ADM_VST_PACKFORMAT_UNSET_ID);
 
-	auto presets = AdmPresetDefinitionsHelper::getSingleton();
-	auto pfData = presets->getPackFormatData(typeDefinitionValue, packFormatIdValue);
+	auto& presets = AdmPresetDefinitionsHelper::getSingleton();
+	auto pfData = presets.getPackFormatData(typeDefinitionValue, packFormatIdValue);
 
 	if (pfData) {
 		std::optional<int> specificCfIdValue;
 		if (channelFormatIdValue != ADM_VST_CHANNELFORMAT_ALLCHANNELS_ID)
 			specificCfIdValue = channelFormatIdValue;
 
-		auto holder = presets->setupPresetDefinitionObject(parentDocument, audioObject,
+		auto holder = presets.setupPresetDefinitionObject(parentDocument, audioObject,
 			pfData->packFormat->get<adm::AudioPackFormatId>(), specificCfIdValue);
 
 		audioPackFormat = holder.audioPackFormat;

diff --git a/reaper-adm-extension/src/reaper_adm/exportaction_admsource-earvst.cpp b/reaper-adm-extension/src/reaper_adm/exportaction_admsource-earvst.cpp
@@ -225,7 +225,7 @@ void EarVstExportSources::generateAdmAndChna(ReaperAPI const& api)
                 admElements->audioObject->set(adm::Duration{ duration });
             }
 
-            const bool isPresetDef = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(admElements->audioPackFormat) != nullptr;
+            const bool isPresetDef = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(admElements->audioPackFormat) != nullptr;
             const bool isObjectType = admElements->typeDescriptor == adm::TypeDefinition::OBJECTS;
 
             if (!isPresetDef) {

diff --git a/reaper-adm-extension/src/reaper_adm/pluginsuite_ear.cpp b/reaper-adm-extension/src/reaper_adm/pluginsuite_ear.cpp
@@ -129,7 +129,7 @@ std::vector<int> determineUsedDirectSpeakersTrackMappingValues(PluginInstance& p
     assert(packFormatId.has_value());
 
     if (trackMapping.has_value() && *trackMapping >= 0 && packFormatId.has_value()) {
-        auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(1, *packFormatId);
+        auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(1, *packFormatId);
         if (pfData) {
             int trackWidth = pfData->relatedChannelFormats.size();
             for (int channelCounter = 0; channelCounter < trackWidth; channelCounter++) {
@@ -153,7 +153,7 @@ std::vector<int> determineUsedHoaTrackMappingValues(PluginInstance& plugin) {
 	assert(packFormatId.has_value());
 
 	if (trackMapping.has_value() && *trackMapping >= 0 && packFormatId.has_value()) {
-		auto pfData = AdmPresetDefinitionsHelper::getSingleton()->getPackFormatData(4, *packFormatId);
+		auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(4, *packFormatId);
 		if(pfData) {
 			int trackWidth = pfData->relatedChannelFormats.size();
 			for (int channelCounter = 0; channelCounter < trackWidth; channelCounter++) {
@@ -419,8 +419,7 @@ void EARPluginSuite::onCreateDirectTrack(TrackElement & trackElement, const Reap
     if(automationElements.size() > 0) {
         auto channel = automationElements.front()->channel();
         auto packFormat = channel.packFormat();
-        auto defs = AdmPresetDefinitionsHelper::getSingleton();
-        auto pfData = defs->getPackFormatData(packFormat);
+        auto pfData = AdmPresetDefinitionsHelper::getSingleton().getPackFormatData(packFormat);
 
         if(pfData) {
             int32_t routingToScene = -1;