Allow loading external pipe configs.

Author: Archie3d

Source/Parameters.cpp

@@ -28,15 +28,15 @@ using namespace juce;
 Parameters::Parameters(AeolusAudioProcessor& proc)
     : processor(proc)
 {
-    processor.addParameter(reverbWet = new AudioParameterFloat("reverb_wet", "Reverb", 0.0f, 1.0f, 0.25f));
-    processor.addParameter(volume = new AudioParameterFloat("volume", "Volume", 0.0f, 1.0f, 0.5f));
+    processor.addParameter(reverbWet = new AudioParameterFloat(ParameterID{"reverb_wet", 1}, "Reverb", 0.0f, 1.0f, 0.25f));
+    processor.addParameter(volume = new AudioParameterFloat(ParameterID{"volume", 1}, "Volume", 0.0f, 1.0f, 0.5f));
 
     auto& engine = proc.getEngine();
 
     for (int i = 0; i < engine.getDivisionCount(); ++i) {
         auto* division = engine.getDivisionByIndex(i);
 
-        auto param = std::make_unique<AudioParameterFloat>(String("gain_") + String(i), division->getName() + " gain", 0.0f, 1.0f, 0.5f);
+        auto param = std::make_unique<AudioParameterFloat>(ParameterID{String("gain_") + String(i), 1}, division->getName() + " gain", 0.0f, 1.0f, 0.5f);
         auto* ptr = param.get();
         processor.addParameter(param.release());
         divisionsGain.push_back(ptr);
@@ -87,4 +87,4 @@ void Parameters::fromVar(const var& v)
             }
         }
     }
-}
+}

Source/aeolus/addsynth.cpp

@@ -552,11 +552,90 @@ Result Addsynth::readFromResource(const String& name)
     return read(stream);
 }
 
+Result Addsynth::readFromFile(const File& file)
+{
+    if (!file.exists())
+        return Result::fail("File does not exist");
+
+    const auto ext{ file.getFileExtension().toLowerCase() };
+
+    if (ext == ".ae0") {
+        FileInputStream stream(file);
+        return read(stream);
+    }
+
+    if (ext == ".json") {
+        FileInputStream stream(file);
+        auto stop = JSON::parse(stream);
+        // @todo We don't handle JSON parsing errors currently
+        fromVar(stop);
+        return Result::ok();
+    }
+
+    return Result::fail("Unknown file format");
+}
+
 //==============================================================================
 
 Model::Model()
     : _synths()
     , _nameToSynthMap()
+{
+    loadExternalPipes();
+    loadEmbeddedPipes();
+}
+
+StringArray Model::getStopNames() const
+{
+    StringArray stops;
+
+    for (const auto* synth : _synths) {
+        stops.add(synth->getStopName());
+    }
+
+    return stops;
+}
+
+Addsynth* Model::getStopByName(const juce::String& name)
+{
+    auto it = _nameToSynthMap.find(name);
+
+    if (it == _nameToSynthMap.end())
+        return nullptr;
+
+    return it->second;
+}
+
+void Model::loadExternalPipes()
+{
+    File configFile{ aeolus::getCustomOrganConfigFile() };
+    const String configFileName{ configFile.getFileName() };
+    File configFolder{ configFile.getParentDirectory() };
+    
+    if (!configFolder.exists())
+        return;
+
+    for (DirectoryEntry entry : RangedDirectoryIterator(configFolder, true)) {
+        auto file{ entry.getFile() };
+        const auto ext{ file.getFileExtension().toLowerCase() };
+
+        if ((ext == ".json" && file.getFileName() != configFileName) || (ext == ".ae0")) {
+            auto synth = std::make_unique<Addsynth>();
+            const auto res{ synth->readFromFile(file) };
+
+            if (res.wasOk()) {
+                String stopName{ file.getFileNameWithoutExtension() };
+                synth->setStopName(stopName);
+
+                addSynth(std::move(synth));
+            } else {
+                DBG("Failed to read: " << res.getErrorMessage());
+            }
+        }
+    }
+}
+
+void Model::loadEmbeddedPipes()
 {
     for (int i = 0; i < BinaryData::namedResourceListSize; ++i) {
         String filename(BinaryData::originalFilenames[i]);
@@ -590,34 +669,27 @@ Model::Model()
         }
 
         if (ok) {
-            auto* ptr = synth.get();
-            ptr->setStopName(stopName);
-
-            _synths.add(synth.release());
-            _nameToSynthMap[stopName] = ptr;
+            synth->setStopName(stopName);
+            addSynth(std::move(synth));
         }
     }
 }
 
-StringArray Model::getStopNames() const
-{
-    StringArray stops;
-
-    for (const auto* synth : _synths) {
-        stops.add(synth->getStopName());
-    }
-
-    return stops;
-}
-
-Addsynth* Model::getStopByName(const juce::String& name)
+void Model::addSynth(std::unique_ptr<Addsynth>&& synthToAdd)
 {
-    auto it = _nameToSynthMap.find(name);
+    std::unique_ptr<Addsynth> synth{ std::move(synthToAdd) };
+    const String stopName{ synth->getStopName() };
 
-    if (it == _nameToSynthMap.end())
-        return nullptr;
+    if (_nameToSynthMap.find(stopName) == _nameToSynthMap.end()) {
+        auto* ptr = synth.get();
+        ptr->setStopName(stopName);
 
-    return it->second;
+        _synths.add(synth.release());
+        _nameToSynthMap[stopName] = ptr;
+    } else {
+        // Pipe with this name already exists - it won't be added again
+        DBG("Pipe " << stopName << " duplicate found");
+    }
 }
 
 JUCE_IMPLEMENT_SINGLETON(Model)

Source/aeolus/addsynth.h

@@ -114,6 +114,7 @@ class Addsynth final
     juce::Result read(juce::InputStream& stream);
 
     juce::Result readFromResource(const juce::String& name);
+    juce::Result readFromFile(const juce::File& file);
 
     float getNoteVolume(int n) const noexcept { return _n_vol[n]; }
     float getNoteAttack(int n) const noexcept { return _n_att[n]; }
@@ -195,6 +196,10 @@ class Model : public juce::DeletedAtShutdown
     Model();
     ~Model() override  { clearSingletonInstance(); }
 
+    void loadExternalPipes();
+    void loadEmbeddedPipes();
+    void addSynth(std::unique_ptr<Addsynth>&& synth);
+
     juce::OwnedArray<Addsynth> _synths;
     std::map<juce::String, Addsynth*> _nameToSynthMap;
 };