Fixed channels and profiles that are reported through profile inquiry

gbevin · Apr 11, 2024 · fa9f76c · fa9f76c
1 parent d07812b
commit fa9f76c
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 7 deletions.
diff --git a/Source/MpeProfileNegotation.cpp b/Source/MpeProfileNegotation.cpp
@@ -45,18 +45,30 @@ MpeProfileNegotiation::MpeProfileNegotiation()
                                        .withOutputs({ this })
                                        .withProfileDelegate(this));
     ci_->addListener(*this);
+}
 
-    // support the MPE Profile on any channel as the manager channel, except on channel 16
-    // we support all the possible channels upwards from the manager channel
+void MpeProfileNegotiation::setProfileMidiName(const String& name)
+{
+    // remove all registered profiles
     for (int ch = 0x0; ch <= 0xE; ++ch)
     {
-        auto max_channels = 0xF - ch + 1;
-        ci_->getProfileHost()->addProfile({ MPE_PROFILE, ci::ChannelAddress().withChannel((ci::ChannelInGroup)ch) }, max_channels);
+        ci_->getProfileHost()->removeProfile({ MPE_PROFILE, ci::ChannelAddress().withChannel((ci::ChannelInGroup)ch) });
+    }
+
+    // register profiles for all active manager channels
+    if (manager_ == 0)
+    {
+        // support the MPE Profile on any channel as the manager channel, except on channel 16
+        for (int ch = 0x0; ch <= 0xE; ++ch)
+        {
+            addMpeProfile(ch);
+        }
+    }
+    else if (manager_ > 0)
+    {
+        addMpeProfile(manager_ - 1);
     }
-}
 
-void MpeProfileNegotiation::setProfileMidiName(const String& name)
-{
     midiName_ = name;
 
 #if (JUCE_LINUX || JUCE_MAC)
@@ -78,6 +90,16 @@ void MpeProfileNegotiation::setProfileMidiName(const String& name)
 #endif
 }
 
+void MpeProfileNegotiation::addMpeProfile(int manager)
+{
+    auto max_channels = 0xF - manager + 1;
+    if (members_ > 0)
+    {
+        max_channels = std::min(members_ + 1, max_channels);
+    }
+    ci_->getProfileHost()->addProfile({ MPE_PROFILE, ci::ChannelAddress().withChannel((ci::ChannelInGroup)manager) }, max_channels);
+}
+
 void MpeProfileNegotiation::setManager(int manager)
 {
     manager_ = manager;

diff --git a/Source/MpeProfileNegotiation.h b/Source/MpeProfileNegotiation.h
@@ -39,6 +39,8 @@ class MpeProfileNegotiation : ci::DeviceListener, ci::ProfileDelegate, ci::Devic
 private:
     static std::string muidToString(ci::MUID muid);
 
+    void addMpeProfile(int manager);
+
     virtual void handleIncomingMidiMessage(MidiInput* source,
                                            const MidiMessage& message) override;