non
/
spiralsynthmodular
mirror of https://github.com/original-male/spiralsynthmodular
1
0
Fork 0
Code Releases 0 Activity
Browse Source

Some code shuffling to fix load->save->load bug

master
waxfrenzy 22 years ago
parent
5468375aac
commit
5b1ea50f0f
3 changed files with 204 additions and 167 deletions
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. +198
    -163
      SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C
  2. +5
    -3
      SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h
  3. +1
    -1
      SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C

+ 198
- 163
SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C View File

@@ -330,6 +330,8 @@ void LADSPAPlugin::StreamIn(istream &s)
{ {
case 5: case 5:
{ {
ClearPlugin();

s>>m_Gain; s>>m_Gain;


unsigned long UniqueID; unsigned long UniqueID;
@@ -362,11 +364,17 @@ void LADSPAPlugin::StreamIn(istream &s)
m_PortDefault.push_back(Default); m_PortDefault.push_back(Default);
} }


UpdatePlugin(UniqueID, false);
if (SelectPlugin(UniqueID)) {
SetGUIExports();
} else {
ClearPlugin();
}
} }
break; break;
case 4: case 4:
{ {
ClearPlugin();

s>>m_Gain; s>>m_Gain;


unsigned long UniqueID; unsigned long UniqueID;
@@ -398,12 +406,18 @@ void LADSPAPlugin::StreamIn(istream &s)
m_PortDefault.push_back(0.0f); m_PortDefault.push_back(0.0f);
} }


UpdatePlugin(UniqueID, false);
if (SelectPlugin(UniqueID)) {
SetGUIExports();
} else {
ClearPlugin();
}
} }
break; break;


case 3: case 3:
{ {
ClearPlugin();

s>>m_Gain; s>>m_Gain;


string Filename,Label; string Filename,Label;
@@ -440,13 +454,19 @@ void LADSPAPlugin::StreamIn(istream &s)
{ {
// Get Unique ID from filename and label // Get Unique ID from filename and label
unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label); unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label);
if (id) UpdatePlugin(id, false);
if (SelectPlugin(id)) {
SetGUIExports();
} else {
ClearPlugin();
}
} }
} }
break; break;


case 2: case 2:
{ {
ClearPlugin();

s>>m_Gain; s>>m_Gain;


string Filename,Label; string Filename,Label;
@@ -482,7 +502,11 @@ void LADSPAPlugin::StreamIn(istream &s)
{ {
// Get Unique ID from filename and label // Get Unique ID from filename and label
unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label); unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label);
if (id) UpdatePlugin(id, false);
if (SelectPlugin(id)) {
SetGUIExports();
} else {
ClearPlugin();
}
} }
} }
break; break;
@@ -499,55 +523,31 @@ void LADSPAPlugin::StreamIn(istream &s)
// Get Unique ID from filename and label // Get Unique ID from filename and label
unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label); unsigned long id = m_LADSPAInfo.GetIDFromFilenameAndLabel(Filename, Label);
// Reset Port Settings, as none will be in file // Reset Port Settings, as none will be in file
if (id) UpdatePlugin(id, true);
if (id) UpdatePlugin(id);
} }
} }
break; break;
} }
} }


void
LADSPAPlugin::ClearPlugin(void)
bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID)
{ {
// Clear selected plugin
if (PlugDesc) {
if (PlugDesc->deactivate) PlugDesc->deactivate(PlugInstHandle);
PlugDesc->cleanup(PlugInstHandle);
PlugDesc = NULL;
}

m_PluginIndex = 0;
m_InputPortCount = 0;
m_Gain = 1.0f;
m_Amped = false;
strncpy(m_Name, "None\0", 5);
strncpy(m_Maker, "None\0", 5);

for(vector<LADSPA_Data*>::iterator i=m_LADSPABufVec.begin();
i!=m_LADSPABufVec.end(); i++)
{
if (*i) delete[] (*i);
ClearPlugin();
if (SelectPlugin(UniqueID)) {
ResetPortSettings();
SetGUIExports();
return true;
} }
m_LADSPABufVec.clear();

RemoveAllInputs();
RemoveAllOutputs();


m_PluginInfo.NumInputs = 0;
m_PluginInfo.NumOutputs = 0;
m_PluginInfo.PortTips.clear();
// Oops. Clean up.
ClearPlugin();
cerr << "Error loading LADSPA Plugin.\n";


m_PortID.clear();
m_PortMin.clear();
m_PortMax.clear();
m_PortClamp.clear();
m_PortDefault.clear();
return false;
} }


bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool ResetPortSettings)
bool LADSPAPlugin::SelectPlugin(unsigned long UniqueID)
{ {
ClearPlugin();

PlugDesc = m_LADSPAInfo.GetDescriptorByID(UniqueID, true); PlugDesc = m_LADSPAInfo.GetDescriptorByID(UniqueID, true);


if (PlugDesc) { if (PlugDesc) {
@@ -556,7 +556,7 @@ bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool ResetPortSettings)
cerr << "WARNING: Could not instantiate plugin " << UniqueID << endl; cerr << "WARNING: Could not instantiate plugin " << UniqueID << endl;
m_LADSPAInfo.UnloadLibraryByID(UniqueID); m_LADSPAInfo.UnloadLibraryByID(UniqueID);
PlugDesc = 0; PlugDesc = 0;
return 0;
return false;
} }


// Find number of input and output ports // Find number of input and output ports
@@ -636,101 +636,143 @@ bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool ResetPortSettings)
} }


UpdatePluginInfoWithHost(); UpdatePluginInfoWithHost();
return true;
}
return false;
}

void LADSPAPlugin::ClearPlugin(void)
{
// Clear selected plugin
if (PlugDesc) {
if (PlugDesc->deactivate) PlugDesc->deactivate(PlugInstHandle);
PlugDesc->cleanup(PlugInstHandle);
PlugDesc = NULL;
}


if (ResetPortSettings)
m_PluginIndex = 0;
m_InputPortCount = 0;
m_Gain = 1.0f;
m_Amped = false;
strncpy(m_Name, "None\0", 5);
strncpy(m_Maker, "None\0", 5);

for(vector<LADSPA_Data*>::iterator i=m_LADSPABufVec.begin();
i!=m_LADSPABufVec.end(); i++)
{
if (*i) delete[] (*i);
}
m_LADSPABufVec.clear();

RemoveAllInputs();
RemoveAllOutputs();

m_PluginInfo.NumInputs = 0;
m_PluginInfo.NumOutputs = 0;
m_PluginInfo.PortTips.clear();

m_PortID.clear();
m_PortMin.clear();
m_PortMax.clear();
m_PortClamp.clear();
m_PortDefault.clear();
}

void LADSPAPlugin::ResetPortSettings(void)
{
for (int n=0; n<m_PluginInfo.NumInputs; n++)
{
float Max=1.0f, Min=-1.0f, Default=0.0f;
int Port=m_PortID[n];

// Get the bounding hints for the port
LADSPA_PortRangeHintDescriptor HintDesc=PlugDesc->PortRangeHints[Port].HintDescriptor;
if (LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc))
{ {
for (int n=0; n<m_PluginInfo.NumInputs; n++)
Min=PlugDesc->PortRangeHints[Port].LowerBound;
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc))
{ {
float Max=1.0f, Min=-1.0f, Default=0.0f;
int Port=m_PortID[n];

// Get the bounding hints for the port
LADSPA_PortRangeHintDescriptor HintDesc=PlugDesc->PortRangeHints[Port].HintDescriptor;
if (LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc))
{
Min=PlugDesc->PortRangeHints[Port].LowerBound;
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc))
{
Min*=m_HostInfo->SAMPLERATE;
}
}
if (LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc))
{
Max=PlugDesc->PortRangeHints[Port].UpperBound;
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc))
{
Max*=m_HostInfo->SAMPLERATE;
}
}
Min*=m_HostInfo->SAMPLERATE;
}
}
if (LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc))
{
Max=PlugDesc->PortRangeHints[Port].UpperBound;
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc))
{
Max*=m_HostInfo->SAMPLERATE;
}
}


#ifdef LADSPA_VERSION #ifdef LADSPA_VERSION
// We've got a version of the header that supports port defaults // We've got a version of the header that supports port defaults
if (LADSPA_IS_HINT_HAS_DEFAULT(HintDesc)) {
// LADSPA_HINT_DEFAULT_0 is assumed anyway, so we don't check for it
if (LADSPA_IS_HINT_DEFAULT_1(HintDesc)) {
Default = 1.0f;
} else if (LADSPA_IS_HINT_DEFAULT_100(HintDesc)) {
Default = 100.0f;
} else if (LADSPA_IS_HINT_DEFAULT_440(HintDesc)) {
Default = 440.0f;
} else {
// These hints may be affected by SAMPLERATE, LOGARITHMIC and INTEGER
if (LADSPA_IS_HINT_DEFAULT_MINIMUM(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc)) {
Default=PlugDesc->PortRangeHints[Port].LowerBound;
} else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc)) {
Default=PlugDesc->PortRangeHints[Port].UpperBound;
} else if (LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc)) {
// These hints require both upper and lower bounds
float lp = 0.0f, up = 0.0f;
float min = PlugDesc->PortRangeHints[Port].LowerBound;
float max = PlugDesc->PortRangeHints[Port].UpperBound;
if (LADSPA_IS_HINT_DEFAULT_LOW(HintDesc)) {
lp = 0.75f;
up = 0.25f;
} else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(HintDesc)) {
lp = 0.5f;
up = 0.5f;
} else if (LADSPA_IS_HINT_DEFAULT_HIGH(HintDesc)) {
lp = 0.25f;
up = 0.75f;
}
if (LADSPA_IS_HINT_HAS_DEFAULT(HintDesc)) {
// LADSPA_HINT_DEFAULT_0 is assumed anyway, so we don't check for it
if (LADSPA_IS_HINT_DEFAULT_1(HintDesc)) {
Default = 1.0f;
} else if (LADSPA_IS_HINT_DEFAULT_100(HintDesc)) {
Default = 100.0f;
} else if (LADSPA_IS_HINT_DEFAULT_440(HintDesc)) {
Default = 440.0f;
} else {
// These hints may be affected by SAMPLERATE, LOGARITHMIC and INTEGER
if (LADSPA_IS_HINT_DEFAULT_MINIMUM(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc)) {
Default=PlugDesc->PortRangeHints[Port].LowerBound;
} else if (LADSPA_IS_HINT_DEFAULT_MAXIMUM(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc)) {
Default=PlugDesc->PortRangeHints[Port].UpperBound;
} else if (LADSPA_IS_HINT_BOUNDED_BELOW(HintDesc) &&
LADSPA_IS_HINT_BOUNDED_ABOVE(HintDesc)) {
// These hints require both upper and lower bounds
float lp = 0.0f, up = 0.0f;
float min = PlugDesc->PortRangeHints[Port].LowerBound;
float max = PlugDesc->PortRangeHints[Port].UpperBound;
if (LADSPA_IS_HINT_DEFAULT_LOW(HintDesc)) {
lp = 0.75f;
up = 0.25f;
} else if (LADSPA_IS_HINT_DEFAULT_MIDDLE(HintDesc)) {
lp = 0.5f;
up = 0.5f;
} else if (LADSPA_IS_HINT_DEFAULT_HIGH(HintDesc)) {
lp = 0.25f;
up = 0.75f;
}


if (LADSPA_IS_HINT_LOGARITHMIC(HintDesc)) {
if (min==0.0f || max==0.0f) {
// Zero at either end means zero no matter
// where hint is at, since:
// log(n->0) -> Infinity
Default = 0.0f;
} else {
// Catch negatives
bool neg_min = min < 0.0f ? true : false;
bool neg_max = max < 0.0f ? true : false;

if (!neg_min && !neg_max) {
Default = exp(log(min) * lp + log(max) * up);
} else if (neg_min && neg_max) {
Default = -exp(log(-min) * lp + log(-max) * up);
} else {
// Logarithmic range has asymptote
// so just use linear scale
Default = min * lp + max * up;
}
}
if (LADSPA_IS_HINT_LOGARITHMIC(HintDesc)) {
if (min==0.0f || max==0.0f) {
// Zero at either end means zero no matter
// where hint is at, since:
// log(n->0) -> Infinity
Default = 0.0f;
} else {
// Catch negatives
bool neg_min = min < 0.0f ? true : false;
bool neg_max = max < 0.0f ? true : false;

if (!neg_min && !neg_max) {
Default = exp(log(min) * lp + log(max) * up);
} else if (neg_min && neg_max) {
Default = -exp(log(-min) * lp + log(-max) * up);
} else { } else {
// Logarithmic range has asymptote
// so just use linear scale
Default = min * lp + max * up; Default = min * lp + max * up;
} }
} }
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc)) {
Default *= m_HostInfo->SAMPLERATE;
}
if (LADSPA_IS_HINT_INTEGER(HintDesc)) {
Default = floorf(Default);
}
} else {
Default = min * lp + max * up;
} }
} }
if (LADSPA_IS_HINT_SAMPLE_RATE(HintDesc)) {
Default *= m_HostInfo->SAMPLERATE;
}
if (LADSPA_IS_HINT_INTEGER(HintDesc)) {
Default = floorf(Default);
}
}
}
#else #else
// No LADSPA_VERSION - implies no defaults // No LADSPA_VERSION - implies no defaults
#warning ************************************ #warning ************************************
@@ -741,52 +783,45 @@ bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool ResetPortSettings)
#warning ************************************ #warning ************************************
#endif #endif


m_PortMin.push_back(Min);
m_PortMax.push_back(Max);
m_PortClamp.push_back(true);
m_PortDefault.push_back(Default);
}
}
m_PortMin.push_back(Min);
m_PortMax.push_back(Max);
m_PortClamp.push_back(true);
m_PortDefault.push_back(Default);
}
}


int lbl_length;
char *lbl_start;
void LADSPAPlugin::SetGUIExports(void)
{
int lbl_length;
char *lbl_start;


m_UniqueID = PlugDesc->UniqueID;
m_PluginIndex = m_LADSPAInfo.GetPluginListEntryByID(m_UniqueID) + 1;
m_InputPortCount = m_PluginInfo.NumInputs;
m_UniqueID = PlugDesc->UniqueID;
m_PluginIndex = m_LADSPAInfo.GetPluginListEntryByID(m_UniqueID) + 1;
m_InputPortCount = m_PluginInfo.NumInputs;


lbl_length = strlen(PlugDesc->Name);
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(m_Name, PlugDesc->Name, lbl_length);
m_Name[lbl_length] = '\0';
lbl_length = strlen(PlugDesc->Name);
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(m_Name, PlugDesc->Name, lbl_length);
m_Name[lbl_length] = '\0';


lbl_length = strlen(PlugDesc->Maker);
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(m_Maker, PlugDesc->Maker, lbl_length);
m_Maker[lbl_length] = '\0';

lbl_start = m_OutData.InputPortNames;
for (unsigned long n = 0; n < m_InputPortCount; n++) {
lbl_length = m_PluginInfo.PortTips[n].size();
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(lbl_start, m_PluginInfo.PortTips[n].c_str(), lbl_length);
lbl_start[lbl_length] = '\0';
lbl_start += 256;

m_OutData.InputPortSettings[n].Min = m_PortMin[n];
m_OutData.InputPortSettings[n].Max = m_PortMax[n];
m_OutData.InputPortSettings[n].Clamp = m_PortClamp[n];
m_OutData.InputPortSettings[n].Default = m_PortDefault[n];
}
lbl_length = strlen(PlugDesc->Maker);
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(m_Maker, PlugDesc->Maker, lbl_length);
m_Maker[lbl_length] = '\0';


return true;
lbl_start = m_OutData.InputPortNames;
for (unsigned long n = 0; n < m_InputPortCount; n++) {
lbl_length = m_PluginInfo.PortTips[n].size();
lbl_length = lbl_length > 255 ? 255 : lbl_length;
strncpy(lbl_start, m_PluginInfo.PortTips[n].c_str(), lbl_length);
lbl_start[lbl_length] = '\0';
lbl_start += 256;

m_OutData.InputPortSettings[n].Min = m_PortMin[n];
m_OutData.InputPortSettings[n].Max = m_PortMax[n];
m_OutData.InputPortSettings[n].Clamp = m_PortClamp[n];
m_OutData.InputPortSettings[n].Default = m_PortDefault[n];
} }

// Oops. Clean up.
ClearPlugin();
cerr << "Error loading LADSPA Plugin.\n";

return false;
} }


void LADSPAPlugin::SetPortSettings(void) void LADSPAPlugin::SetPortSettings(void)


+ 5
- 3
SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h View File

@@ -70,10 +70,12 @@ public:
enum GUICommands{NONE,SETPORTSETTINGS,SELECTPLUGIN,CLEARPLUGIN}; enum GUICommands{NONE,SETPORTSETTINGS,SELECTPLUGIN,CLEARPLUGIN};


private: private:
void UpdatePortRange(void);
bool UpdatePlugin(unsigned long UniqueID);
bool SelectPlugin(unsigned long UniqueID);
void ClearPlugin(void); void ClearPlugin(void);
bool UpdatePlugin(unsigned long UniqueID, bool ResetPortSettings=true);
void ResetPortSettings(void);
void SetGUIExports(void);

void SetPortSettings(void); void SetPortSettings(void);


void LoadPluginList(void); void LoadPluginList(void);


+ 1
- 1
SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.C View File

@@ -86,7 +86,7 @@ SpiralPluginGUI(w,h,o,ch)
m_InputScroll->type(Fl_Scroll::VERTICAL); m_InputScroll->type(Fl_Scroll::VERTICAL);
m_InputScroll->box(FL_DOWN_BOX); m_InputScroll->box(FL_DOWN_BOX);
add(m_InputScroll); add(m_InputScroll);
m_InputPack = new Fl_Pack(20,115,460,20,"");
m_InputPack = new Fl_Pack(5,115,460,20,"");
m_InputScroll->add(m_InputPack); m_InputScroll->add(m_InputPack);


m_PowerAmp = new Fl_Button(125,277,100,25,"PowerAmp"); m_PowerAmp = new Fl_Button(125,277,100,25,"PowerAmp");


Write Preview
Loading…
Cancel
Save