Skip to content

Commit

Permalink
fix disable custom audio in/out save warning
Browse files Browse the repository at this point in the history
  • Loading branch information
benkuper committed Nov 26, 2024
1 parent c2b99ee commit 4ca746a
Showing 1 changed file with 32 additions and 16 deletions.
48 changes: 32 additions & 16 deletions Source/Node/Node.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -61,21 +61,24 @@ Node::Node(StringRef name, var params, bool hasAudioInput, bool hasAudioOutput,
{
numAudioInputs = addIntParameter("Audio Inputs", "Number of audio inputs for this node", 2, 0, 64);
customInputNamesCC.reset(new ControllableContainer("Custom Input Names"));
customInputNamesCC->editorIsCollapsed = true;
customIONamesCC->addChildControllableContainer(customInputNamesCC.get());
}

if (hasAudioOutput)
{
numAudioOutputs = addIntParameter("Audio Outputs", "Number of audio outputs for this node", 2, 0, 64);
customOutputNamesCC.reset(new ControllableContainer("Custom Output Names"));
customOutputNamesCC->editorIsCollapsed = true;
customIONamesCC->addChildControllableContainer(customOutputNamesCC.get());
}

customIONamesCC->includeInRecursiveSave = false;
customIONamesCC->saveAndLoadRecursiveData = true;
customIONamesCC->editorIsCollapsed = true;
addChildControllableContainer(customIONamesCC.get());

if(!Engine::mainEngine->isLoadingFile) updateIONamesCC();
if (!Engine::mainEngine->isLoadingFile) updateIONamesCC();
}

if (useOutControl)
Expand Down Expand Up @@ -308,32 +311,45 @@ void Node::updateIONamesCC()
{
if (customInputNamesCC != nullptr)
{
int numParams = numAudioInputs->intValue();
while (customInputNamesCC->controllables.size() < numParams)
if (numAudioInputs->enabled)
{
customInputNamesCC->addStringParameter("Input " + String(customInputNamesCC->controllables.size() + 1), "Custom name for input " + String(customInputNamesCC->controllables.size() + 1), "");
}
int numParams = numAudioInputs->intValue();
while (customInputNamesCC->controllables.size() < numParams)
{
customInputNamesCC->addStringParameter("Input " + String(customInputNamesCC->controllables.size() + 1), "Custom name for input " + String(customInputNamesCC->controllables.size() + 1), "");
}

while (customInputNamesCC->controllables.size() > numParams)
while (customInputNamesCC->controllables.size() > numParams)
{
customInputNamesCC->removeControllable(customInputNamesCC->controllables.getLast());
}
}
else
{
customInputNamesCC->removeControllable(customInputNamesCC->controllables.getLast());
customInputNamesCC->clear();
}
}

//same for output
if (customOutputNamesCC != nullptr)
{
int numParams = numAudioOutputs->intValue();
while (customOutputNamesCC->controllables.size() < numParams)
if (numAudioOutputs->enabled)
{
customOutputNamesCC->addStringParameter("Output " + String(customOutputNamesCC->controllables.size() + 1), "Custom name for output " + String(customOutputNamesCC->controllables.size() + 1), "");
}
int numParams = numAudioOutputs->intValue();
while (customOutputNamesCC->controllables.size() < numParams)
{
customOutputNamesCC->addStringParameter("Output " + String(customOutputNamesCC->controllables.size() + 1), "Custom name for output " + String(customOutputNamesCC->controllables.size() + 1), "");
}

while (customOutputNamesCC->controllables.size() > numParams)
while (customOutputNamesCC->controllables.size() > numParams)
{
customOutputNamesCC->removeControllable(customOutputNamesCC->controllables.getLast());
}
}
else
{
customOutputNamesCC->removeControllable(customOutputNamesCC->controllables.getLast());
customOutputNamesCC->clear();
}

}
}

Expand Down Expand Up @@ -622,7 +638,7 @@ var Node::getJSONData()
bool hasCustomInputNames = false;
bool hasCustomOutputNames = false;

if (numAudioInputs != nullptr)
if (numAudioInputs != nullptr && numAudioInputs->enabled)
{
for (int i = 0; i < numAudioInputs->intValue(); i++)
{
Expand All @@ -641,7 +657,7 @@ var Node::getJSONData()
}
}

if (numAudioOutputs != nullptr)
if (numAudioOutputs != nullptr && numAudioOutputs->enabled)
{
for (int i = 0; i < numAudioOutputs->intValue(); i++)
{
Expand Down

0 comments on commit 4ca746a

Please sign in to comment.