Browse Source

Fix build after last changes

Signed-off-by: falkTX <falktx@falktx.com>
pull/321/head
falkTX 2 years ago
parent
commit
ad3c5dae30
Signed by: falkTX <falktx@falktx.com> GPG Key ID: CDBAA37ABC74FBA0
2 changed files with 36 additions and 32 deletions
  1. +30
    -26
      distrho/src/DistrhoPluginInternal.hpp
  2. +6
    -6
      distrho/src/DistrhoPluginVST3.cpp

+ 30
- 26
distrho/src/DistrhoPluginInternal.hpp View File

@@ -523,6 +523,36 @@ public:
{
return getAudioPort(input, index).hints;
}
uint32_t getAudioPortCountWithGroupId(const bool input, const uint32_t groupId) const noexcept
{
DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr, 0);

uint32_t numPorts = 0;

if (input)
{
#if DISTRHO_PLUGIN_NUM_INPUTS > 0
for (uint32_t i=0; i<DISTRHO_PLUGIN_NUM_INPUTS; ++i)
{
if (fData->audioPorts[i].groupId == groupId)
++numPorts;
}
#endif
}
else
{
#if DISTRHO_PLUGIN_NUM_OUTPUTS > 0
for (uint32_t i=0; i<DISTRHO_PLUGIN_NUM_OUTPUTS; ++i)
{
if (fData->audioPorts[i + DISTRHO_PLUGIN_NUM_INPUTS].groupId == groupId)
++numPorts;
}
#endif
}

return numPorts;
}
#endif

uint32_t getParameterCount() const noexcept
@@ -674,32 +704,6 @@ public:
return fData->portGroupCount;
}

uint32_t getPortCountWithGroupId(const bool input, const uint32_t groupId) const noexcept
{
DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr, 0);

uint32_t numPorts = 0;

if (input)
{
for (uint32_t i=0; i<(input ? DISTRHO_PLUGIN_NUM_INPUTS : DISTRHO_PLUGIN_NUM_OUTPUTS); ++i)
{
if (fData->audioPorts[i].groupId == groupId)
++numPorts;
}
}
else
{
for (uint32_t i=0; i<(input ? DISTRHO_PLUGIN_NUM_INPUTS : DISTRHO_PLUGIN_NUM_OUTPUTS); ++i)
{
if (fData->audioPorts[i + DISTRHO_PLUGIN_NUM_INPUTS].groupId == groupId)
++numPorts;
}
}

return numPorts;
}

const PortGroupWithId& getPortGroupById(const uint32_t groupId) const noexcept
{
DISTRHO_SAFE_ASSERT_RETURN(fData != nullptr && fData->portGroupCount != 0, sFallbackPortGroup);


+ 6
- 6
distrho/src/DistrhoPluginVST3.cpp View File

@@ -872,7 +872,7 @@ public:
#if DISTRHO_PLUGIN_NUM_INPUTS > 0
if (busId < inputBuses.numGroups)
{
numChannels = fPlugin.getPortCountWithGroupId(true, busId);
numChannels = fPlugin.getAudioPortCountWithGroupId(true, busId);
busType = V3_AUX;
flags = 0;

@@ -972,7 +972,7 @@ public:
#if DISTRHO_PLUGIN_NUM_OUTPUTS > 0
if (busId < outputBuses.numGroups)
{
numChannels = fPlugin.getPortCountWithGroupId(false, busId);
numChannels = fPlugin.getAudioPortCountWithGroupId(false, busId);
busType = V3_AUX;
flags = 0;

@@ -1499,7 +1499,7 @@ public:
default:
if (busId < inputBuses.numGroups)
{
const uint32_t numPortsInBus = fPlugin.getPortCountWithGroupId(true, busId);
const uint32_t numPortsInBus = fPlugin.getAudioPortCountWithGroupId(true, busId);
arr = 0x0;
for (uint32_t j=0; j<numPortsInBus; ++j)
arr |= 1ull << (j + 33ull);
@@ -1532,7 +1532,7 @@ public:
return V3_OK;
}
#endif // DISTRHO_PLUGIN_NUM_INPUTS
d_stdout("invalid bus arrangement %d", busId);
d_stdout("invalid bus arrangement %d", busIndex);
return V3_INVALID_ARG;
}
else
@@ -1558,7 +1558,7 @@ public:
default:
if (busId < outputBuses.numGroups)
{
const uint32_t numPortsInBus = fPlugin.getPortCountWithGroupId(false, busId);
const uint32_t numPortsInBus = fPlugin.getAudioPortCountWithGroupId(false, busId);
arr = 0x0;
for (uint32_t j=0; j<numPortsInBus; ++j)
arr |= 1ull << (j + 33ull);
@@ -1591,7 +1591,7 @@ public:
return V3_OK;
}
#endif // DISTRHO_PLUGIN_NUM_OUTPUTS
d_stdout("invalid bus arrangement %d", busId);
d_stdout("invalid bus arrangement %d", busIndex);
return V3_INVALID_ARG;
}
}


Loading…
Cancel
Save