Fix DS width not considered on finding input channels

Author: rsjbailey

reaper-adm-extension/src/reaper_adm/exportaction_admsource-earvst.cpp

@@ -366,7 +366,11 @@ std::vector<std::shared_ptr<PluginInstance>> EarVstExportSources::getEarInputPlu
             if(EarInputVst::isInputPlugin(api, trk, vstPos)) {
                 auto pluginInst = std::make_shared<EarInputVst>(trk, vstPos, api);
                 auto pluginTrackMapping = pluginInst->getTrackMapping();
-                if(pluginTrackMapping == trackMapping) {
+                auto pluginWidth = pluginInst->getWidth();
+                auto pluginStartCh = pluginTrackMapping;
+                auto pluginEndCh = pluginTrackMapping + pluginWidth - 1;
+
+                if(trackMapping >= pluginStartCh && trackMapping <= pluginEndCh) {
                     insts.push_back(std::make_shared<PluginInstance>(trk, vstPos, api));
                 }
             }
@@ -479,20 +483,32 @@ bool EarInputVst::vstPosIsObjectVst(ReaperAPI const& api, MediaTrack *trk, int v
     return (strcmp(name, getObjectVstCompName()) == 0);
 }
 
-bool EarInputVst::isInputPlugin(char * vstName)
+bool EarInputVst::isObjectPlugin(std::string vstNameStr)
 {
-    auto vstNameStr = std::string(vstName);
     // Name only
     if(vstNameStr == objectVstName) return true;
+    // Comparison name (includes VST3: and ends with company name and channel count)
+    getObjectVstCompName(); // need to ensure generated
+    if (strncmp (vstNameStr.c_str(), getObjectVstCompName(), objectVstCompNameLen) == 0) return true;
+    return false;
+}
+
+bool EarInputVst::isDirectSpeakersPlugin(std::string vstNameStr)
+{
+    // Name only
     if(vstNameStr == directSpeakersVstName) return true;
     // Comparison name (includes VST3: and ends with company name and channel count)
     getDirectSpeakersVstCompName(); // need to ensure generated
-    if (strncmp (vstName, getDirectSpeakersVstCompName(), directSpeakersVstCompNameLen) == 0) return true;
-    getObjectVstCompName(); // need to ensure generated
-    if (strncmp (vstName, getObjectVstCompName(), objectVstCompNameLen) == 0) return true;
+    if (strncmp (vstNameStr.c_str(), getDirectSpeakersVstCompName(), directSpeakersVstCompNameLen) == 0) return true;
     return false;
 }
 
+bool EarInputVst::isInputPlugin(char * vstName)
+{
+    auto vstNameStr = std::string(vstName);
+    return isObjectPlugin(vstNameStr) || isDirectSpeakersPlugin(vstNameStr);
+}
+
 bool EarInputVst::isInputPlugin(ReaperAPI const& api, MediaTrack *trk, int vstPos) {
     if(vstPosIsObjectVst(api, trk, vstPos)) return true;
     if(vstPosIsDirectSpeakersVst(api, trk, vstPos)) return true;
@@ -531,6 +547,20 @@ int EarInputVst::getTrackMapping()
     return *optVal;
 }
 
+int EarInputVst::getWidth()
+{
+    if(isObjectPlugin(name)) return 1;
+    if(!isDirectSpeakersPlugin(name)) return 0;
+
+    assert(paramSpeakerLayout);
+    auto speakerLayout = getParameterWithConvertToInt(*paramSpeakerLayout);
+    assert(speakerLayout.has_value());
+
+    int trackWidth = speakerLayout.has_value()? EARPluginSuite::countChannelsInSpeakerLayout(*speakerLayout) : 0;
+
+    return trackWidth;
+}
+
 // EarSceneMasterVst
 
 std::string EarSceneMasterVst::vstName = admplug::EARPluginSuite::SCENEMASTER_PLUGIN_NAME;

reaper-adm-extension/src/reaper_adm/exportaction_admsource-earvst.h

@@ -60,7 +60,7 @@ class EarInputVst : public PluginInstance
     ~EarInputVst() {};
 
     int getTrackMapping();
-    // TODO: Probably gonna need a "getWidth" (or similar) method too at some point
+    int getWidth();
 
     // Statics
 
@@ -78,11 +78,15 @@ class EarInputVst : public PluginInstance
     static std::vector<int> trackObjectVstIndexes(ReaperAPI const& api, MediaTrack *trk);
     static bool vstPosIsObjectVst(ReaperAPI const& api, MediaTrack *trk, int vstPos);
 
+    static bool isObjectPlugin(std::string vstNameStr);
+    static bool isDirectSpeakersPlugin(std::string vstNameStr);
     static bool isInputPlugin(char* vstName);
     static bool isInputPlugin(ReaperAPI const& api, MediaTrack *trk, int vstPos);
 
 private:
+    // TODO: Fix hard-coded values - pull from plugin suite
     std::unique_ptr<PluginParameter> paramTrackMapping{ createPluginParameter(0, { -1.0, 63.0 }) };
+    std::unique_ptr<PluginParameter> paramSpeakerLayout{ createPluginParameter(1, { -1.0, 13.0 }) };
 
     // Statics
 

reaper-adm-extension/src/reaper_adm/exportaction_pcmsink.cpp

@@ -68,7 +68,7 @@ PCM_sink_adm::PCM_sink_adm(std::shared_ptr<ReaperAPI> api, const char *fn, void
     // Check other errors (warnings/infos are fine... we can continue with those)
     auto errors = admExportHandler->generateExportErrorStrings();
     if(errors.size() > 0) {
-        auto op = std::string("Can not render to the following issues:\r\n");
+        auto op = std::string("Can not render due to the following issues:\r\n");
         for(auto& error : errors) {
             op.append("\r\n");
             op.append(error);

reaper-adm-extension/src/reaper_adm/pluginsuite_ear.cpp

@@ -135,14 +135,6 @@ namespace {
         return pfData->relatedChannelFormats.size();
     }
 
-    int countChannelsInSpeakerLayout(int slIndex) {
-        auto pfId = getPackFormatIdFromSpeakerLayoutIndex(slIndex);
-        if(pfId.has_value()) {
-            return countChannelsInPackFormat(*pfId);
-        }
-        return 0;
-    }
-
     std::vector<int> determineUsedObjectTrackMappingValues(PluginInstance& plugin) {
         auto param = createPluginParameter(static_cast<int>(EarObjectParameters::TRACK_MAPPING), { TRACK_MAPPING_MIN, TRACK_MAPPING_MAX });
         auto trackMapping = plugin.getParameterWithConvertToInt(*(param.get()));
@@ -163,7 +155,7 @@ namespace {
         auto speakerLayoutParam = createPluginParameter(static_cast<int>(EarDirectSpeakersParameters::SPEAKER_LAYOUT), { SPEAKER_LAYOUT_MIN, SPEAKER_LAYOUT_MAX });
         auto speakerLayout = plugin.getParameterWithConvertToInt(*(speakerLayoutParam.get()));
         assert(speakerLayout.has_value());
-        int trackWidth = speakerLayout.has_value()? countChannelsInSpeakerLayout(*speakerLayout) : 0;
+        int trackWidth = speakerLayout.has_value()? EARPluginSuite::countChannelsInSpeakerLayout(*speakerLayout) : 0;
         if(trackWidth <= 0) trackWidth = 1; // Track mapping is single channel by default.
 
         if(trackMapping.has_value() && *trackMapping >= 0) {
@@ -400,6 +392,15 @@ bool admplug::EARPluginSuite::representAdmStructureWithGroups(ReaperAPI const &
     return false; // Scene master does this!
 }
 
+int admplug::EARPluginSuite::countChannelsInSpeakerLayout(int slIndex)
+{
+    auto pfId = getPackFormatIdFromSpeakerLayoutIndex(slIndex);
+    if(pfId.has_value()) {
+        return countChannelsInPackFormat(*pfId);
+    }
+    return 0;
+}
+
 std::vector<std::unique_ptr<PluginParameter>> const& EARPluginSuite::automatedObjectPluginParameters()
 {
     auto static parameters = createAutomatedObjectPluginParameters();

reaper-adm-extension/src/reaper_adm/pluginsuite_ear.h

@@ -37,6 +37,9 @@ namespace admplug {
         static const char* DIRECTSPEAKERS_METADATA_PLUGIN_NAME;
         static const char* SCENEMASTER_PLUGIN_NAME;
         static const char* RENDERER_PLUGIN_NAME;
+
+        static int countChannelsInSpeakerLayout(int slIndex);
+
     private:
         std::vector<std::unique_ptr<PluginParameter>> const & automatedObjectPluginParameters();
         std::vector<std::unique_ptr<TrackParameter>> const & trackParameters();