Merge branch 'dev'

Author: Geka000

PatchCore/build.gradle.kts

@@ -69,7 +69,7 @@ android {
     }
 }
 
-val artifactVersion = "0.1.5"
+val artifactVersion = libs.versions.artifacts.patchCore.get()
 
 mavenPublishing {
     publishToMavenCentral(SonatypeHost.CENTRAL_PORTAL, automaticRelease = false)

PatchCore/src/main/cpp/CMakeLists.txt

@@ -14,7 +14,9 @@ add_library(
         patchcore/module/PatchModule.cpp
         patchcore/module/PolyModule.cpp
         patchcore/module/PolyProxyModule.cpp
-        patchcore/module/Router.cpp
+        patchcore/module/PolyProxyPatchModule.cpp
+        patchcore/module/router/Router.cpp
+        patchcore/module/router/GraphRouter.cpp
 
         patchcore/module/ModuleParameter.cpp
 

PatchCore/src/main/cpp/include/patchcore/module/Module.hpp

@@ -65,6 +65,10 @@ class Module: public OnStartBuffer {
 
     int getSampleRate() const;
 
+public:
+    void onProxyOutputCreated(ModuleOutput* output, const std::string& withName);
+    bool hasProxyOutputs() const;
+
 protected:
 
     virtual void registerInput(ModuleInput& input, const std::string& withName = "") final {
@@ -92,10 +96,9 @@ class Module: public OnStartBuffer {
             userInputs[input.getName()] = &input;
         }
         if (auto floatInput = dynamic_cast<FloatUserInput *>(&input)) {
-            printf("Registering FloatUserInput: %s\n", floatInput->getName().c_str());
             interpolatedInputs.push_back(floatInput);
         } else {
-            printf("Registering UserInput: %s\n", input.getName().c_str());
+            // Do nothing
         }
         input.setModule(this);
     }
@@ -144,6 +147,9 @@ class Module: public OnStartBuffer {
 
     int sampleRate;
     std::string name;
+
+private:
+    bool _hasProxyOutputs = false;
 };
 
 #endif //PATCHCORE_MODULE_HPP

PatchCore/src/main/cpp/include/patchcore/module/PatchModule.hpp

@@ -25,37 +25,40 @@
 
 #include "patchcore/module/factory/ModuleFactory.hpp"
 #include "patchcore/module/Module.hpp"
-#include "patchcore/module/Router.hpp"
+#include "patchcore/module/router/Router.hpp"
+#include "patchcore/module/router/GraphRouter.hpp"
 #include "patchcore/module/output/ProxyModuleOutput.hpp"
 #include "patchcore/module/input/ProxyModuleInput.hpp"
 #include "patchcore/module/input/ProxyModuleUserInput.hpp"
 
 #include <string>
 #include <vector>
 
-// PatchModule can be used to create subModule with multiple modules inside, connections between them and inputs/outputs
-// outward facing inputs/outputs should be exposed manually by calling addInput/addOutput
-// userInputs are available througth getModule("module_name")->getUserInput("input_name") or
-// exposed by addUserInput
-// the main usecase is to create a module dynamically
+/*
+ * PatchModule can be used to create subModule with multiple modules inside, connections between them and inputs/outputs
+ * outward facing inputs/outputs should be exposed manually by calling addInput/addOutput
+ * userInputs are available througth getModule("module_name")->getUserInput("input_name") or
+ * exposed by addUserInput
+ * the main usecase is to create a module dynamically
+ */
 
 class PatchModule : public Module {
 public:
     PatchModule(ModuleFactory *factory, std::string name, int sampleRate);
-    PatchModule(const PatchModule &other);
+    PatchModule(const PatchModule &other); // copy constructor for clone
+public:
     std::unique_ptr<Module> clone() const override;
     virtual ~PatchModule() override;
-
+protected:
+    PatchModule();
     //Module interface
 public:
     void onStartBuffer(int size) override;
     void envelope() override;
-protected:
-    void envelopeModules();
-
     //PatchModule specific
     //creates a new input/output from existing ModuleInput/ModuleOutput
 public:
+    //TODO rename to createProxyInput/Output/UserInput
     virtual ProxyModuleInput* addInput(ModuleInput* input, const std::string& withName);
     virtual ProxyModuleOutput* addOutput(ModuleOutput* output, const std::string& withName);
     virtual UserInput* addUserInput(UserInput* input, const std::string& withName);
@@ -66,9 +69,6 @@ class PatchModule : public Module {
 private:
     ModuleInput* findInputByClone(const ModuleInput &input) const;
     ModuleOutput* findOutputByClone(const ModuleOutput &output) const;
-protected:
-    void addModuleToEnvelope(Module* module);
-    void clearModulesToEnvelope();
 
     //PatchModule specific
 public:
@@ -85,34 +85,26 @@ class PatchModule : public Module {
 
     //PatchModule Router specific
 public:
-    virtual void addPatch(ModuleOutput* output, ModuleInput* input);
-    //TODO add method to remove a single patch
     virtual void resetPatch();
+    virtual void addPatch(ModuleOutput* output, ModuleInput* input);
+    virtual void removePatch(ModuleOutput* output, ModuleInput* input);
 private:
-    void clonePatches(const Router &router);
+    void clonePatches(const AbstractRouter &router);
 
     //Module copy and poly module creation
 public:
     virtual std::unique_ptr<PolyProxyModule> createPolyModuleProxy(PolyModule* polyModule) const override;
 
-private:
+protected:
     std::mutex _mutex;
+private:
     ModuleFactory* _factory;
 
     std::mutex routerMutex;
-    Router _router = Router();
+//    Router _router = Router(this);
+    GraphRouter _router = GraphRouter(this);
 
     std::vector<std::unique_ptr<Module>> _modules  = std::vector<std::unique_ptr<Module>>();
-    //all FloatUserInputs of all modules in this PatchModule
-    std::vector<FloatUserInput *> _inputs = std::vector<FloatUserInput *>();
-
-    //TODO make a better name for this
-    // this is used to envelope modules that are not connected to the router
-    std::vector<Module *> _modulesToAlwaysEnvelope = std::vector<Module *>();
-    std::vector<Module *> _modulesToEnvelope = std::vector<Module *>();
-
-    std::vector<FloatUserInput *> _interpolatedInputsToAlwaysEnvelope = std::vector<FloatUserInput *>();
-    std::vector<FloatUserInput *> _interpolatedInputsToEnvelope = std::vector<FloatUserInput *>();
 
     std::vector<ProxyModuleOutput *> _proxyModuleOutputs;
     std::vector<ProxyModuleInput *> _proxyModuleInputs;

PatchCore/src/main/cpp/include/patchcore/module/PolyModule.hpp

@@ -29,9 +29,11 @@
 #include <string>
 
 
-//the main idea behind this class is to provide an PatchModule interface for polyphonic modules
-//it's acts like a container for multiple PatchModule instances, each representing a voice and proxies
-//methods to all voices
+/*
+ * The main idea behind this class is to provide an PatchModule interface for polyphonic modules
+ * it's acts like a container for multiple PatchModule instances, each representing a voice and proxies
+ * methods to all voices
+ */
 class PolyModule : public PatchModule {
 public:
     PolyModule(ModuleFactory *factory, std::string name, int sampleRate, int voiceCount);
@@ -47,6 +49,7 @@ class PolyModule : public PatchModule {
 public:
     ProxyModuleInput* addInput(ModuleInput* input, const std::string& withName) override;
     ProxyModuleOutput* addOutput(ModuleOutput* output, const std::string& withName) override;
+    virtual ProxyModuleOutput* addDemuxOutput(ModuleOutput* output, const std::string& withName, const int defaultVoiceIndex);
     //don't know in what case this is useful, but it is here for consistency
     UserInput* addUserInput(UserInput* input, const std::string& withName) override;
     //PatchModule specific
@@ -57,27 +60,23 @@ class PolyModule : public PatchModule {
     virtual Module* getModule(const std::string& moduleName) const override;
     //PatchModule Router specific
 public:
-    virtual void addPatch(ModuleOutput* output, ModuleInput* input) override;
     virtual void resetPatch() override;
-
-
+    virtual void addPatch(ModuleOutput* output, ModuleInput* input) override;
+    virtual void removePatch(ModuleOutput* output, ModuleInput* input) override;
     // polyphony support
+public:
     size_t getVoiceCount() const;
-
     PatchModule* getVoice(size_t index);
 
     size_t getActiveVoiceCount() const;
     void setActiveVoiceCount(size_t count);
 
 protected:
-    std::vector<std::unique_ptr<PatchModule>> voices;
+    std::vector<std::unique_ptr<PatchModule>> _voices;
+    std::vector<PatchModule*> voices;
     size_t voiceCount;
     size_t activeVoiceCount;
 
-//    std::unordered_map<std::string, ModuleInput *> inputs;
-//    std::unordered_map<std::string, ModuleOutput *> outputs;
-//    std::unordered_map<std::string, UserInput *> userInputs;
-
    std::vector<std::unique_ptr<PolyProxyModule>> polyProxies;
    std::vector<PolyProxyOutput *> proxyOutputs;
    std::vector<PolyProxyInput *> proxyInputs;

PatchCore/src/main/cpp/include/patchcore/module/PolyProxyModule.hpp

@@ -30,27 +30,35 @@
 
 class PolyModule;
 
+/*
+ * PolyProxyModule is a proxy for a Module inside a PolyModule.
+ * The main purpose for this class is to pass interface calls to the proxied modules.
+ * Default implementation has only Module get Inputs/Outputs/UserInputs functionality.
+ */
+
 class PolyProxyModule : public Module {
 public:
     PolyProxyModule(const Module* module, PolyModule* polyModule);
+protected:
+    PolyProxyModule(const Module* module);
+public:
+    std::unique_ptr<Module> clone() const override; // throw runtime_error
     virtual ~PolyProxyModule() override = default;
-
-    void envelope() override {
-        throw std::runtime_error("PolyProxyModule does not implement envelope method");
-    }
-
-    std::unique_ptr<Module> clone() const override {
-        throw std::runtime_error("PolyProxyModule does not implement clone method");
-    }
-
-    //TODO test it!!! maybe it shouldn't throw an error
-    std::unique_ptr<PolyProxyModule> createPolyModuleProxy(PolyModule *polyModule) const override {
-        throw std::runtime_error("PolyProxyModule does not implement createPolyModuleProxy method");
-    }
+    // module interface
+public:
+    void envelope() override; // throw runtime_error
+    void onStartBuffer(int size) override; // throw runtime_error
+    //for test
+public:
+    // poly module creation
+public:
+    std::unique_ptr<PolyProxyModule> createPolyModuleProxy(PolyModule *polyModule) const override; // throw runtime_error
 
 protected:
+    // needed for derived classes to pass calls to the voices
     std::vector<Module *> modulesToProxy;
 
+    // not needed for now, but kept for consistency and future use
     std::vector<std::unique_ptr<PolyProxyInput>> polyProxyInputs;
     std::vector<std::unique_ptr<PolyProxyOutput>> polyProxyOutputs;
     std::vector<std::unique_ptr<PolyProxyUserInput>> polyProxyUserInputs;

PatchCore/src/main/cpp/include/patchcore/module/PolyProxyPatchModule.hpp

@@ -0,0 +1,58 @@
+/*
+ * PatchCore — Modular Synthesizer Engine
+ * Copyright (c) 2025 Evgenii Petrov
+ *
+ * This file is part of PatchCore.
+ *
+ * PatchCore is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * PatchCore is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU AGPL License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ *
+ * Commercial licensing available: contact sillydevices@gmail.com
+ */
+
+#ifndef PATCHCORE_POLYPROXYPATCHMODULE_HPP
+#define PATCHCORE_POLYPROXYPATCHMODULE_HPP
+
+#include "PolyProxyModule.hpp"
+#include "PatchModule.hpp"
+#include "PolyModule.hpp"
+
+/*
+ * PolyProxyPatchModule is a proxy for a PatchModule inside a PolyModule.
+ * it must have an methods from PatchModule, but PolyModule do almost the same and derives from PatchModule.
+ * So to avoid code duplication PolyProxyPatchModule derives from PolyModule
+ * It doesn't use any PolyProxyModule methods, but it's needed to be used as a PolyProxyModule
+ */
+
+class PolyProxyPatchModule: public PolyProxyModule, public PolyModule {
+public:
+    PolyProxyPatchModule(ModuleFactory *factory, const PatchModule* module, PolyModule* polyModule);
+    ~PolyProxyPatchModule() override = default;
+public:
+    void envelope() override {
+        throw std::runtime_error("PolyProxyPatchModule does not implement envelope method");
+    }
+// Module interface
+// all methods below just call PolyModule versions
+public:
+    const std::unordered_map<std::string, ModuleInput *>& getModuleInputs() const override;
+    ModuleInput* getModuleInput(const std::string& moduleName) override;
+
+    const std::unordered_map<std::string, ModuleOutput *>& getModuleOutputs() const override;
+    ModuleOutput * getModuleOutput(const std::string& outputName) override;
+
+    const std::unordered_map<std::string, UserInput *>& getUserInputs() const override;
+    UserInput *getUserInput(const std::string& inputName) override;
+};
+
+#endif //PATCHCORE_POLYPROXYPATCHMODULE_HPP

PatchCore/src/main/cpp/include/patchcore/module/input/PolyProxyInput.hpp

@@ -44,6 +44,10 @@ class PolyProxyInput : public ModuleInput {
     }
     virtual ~PolyProxyInput() = default;
 public:
+    //TODO this is a hack to update voiceOutput from PolyModule::addInput
+    void setVoiceInput(int voiceIndex, ModuleInput *voiceInput) {
+        voiceInputs[voiceIndex] = voiceInput;
+    }
     void setCompositeVoiceInput(int voiceIndex, ProxyModuleInput *compositeInput) {
         voiceProxyInputs[voiceIndex] = compositeInput;
     }

PatchCore/src/main/cpp/include/patchcore/module/input/PolyProxyUserInput.hpp

@@ -36,6 +36,8 @@ class PolyProxyUserInput {
 
 public:
     virtual UserInput* getVoice(int voiceIndex) = 0;
+    ////TODO this is a hack to update voiceOutput from PolyModule::addUserInput
+    virtual void setVoiceInput(int voiceIndex, ProxyModuleUserInput* voiceInput) = 0;
     virtual void setProxyVoiceInput(int voiceIndex, ProxyModuleUserInput* proxyInput) = 0;
 
 protected:

PatchCore/src/main/cpp/include/patchcore/module/input/user/poly/PolyProxyBoolUserInput.hpp

@@ -49,6 +49,11 @@ class PolyProxyBoolUserInput : public PolyProxyUserInput, public BoolUserInput {
     }
     virtual ~PolyProxyBoolUserInput() = default;
 public:
+    void setVoiceInput(int voiceIndex, ProxyModuleUserInput *voiceInput) override {
+        auto casted = dynamic_cast<ProxyModuleBoolUserInput *>(voiceInput);
+        if (casted == nullptr) throw std::runtime_error("PolyProxyBoolUserInput: Composite input is not a CompositeModuleBoolUserInput");
+        voiceInputs[voiceIndex] = casted;
+    }
     void setProxyVoiceInput(int voiceIndex, ProxyModuleUserInput *compositeInput) override {
         auto casted = dynamic_cast<ProxyModuleBoolUserInput *>(compositeInput);
         if (casted == nullptr) throw std::runtime_error("PolyProxyBoolUserInput: Composite input is not a CompositeModuleBoolUserInput");