From 5444942bed03972a705247c3573f8e9be61982e5 Mon Sep 17 00:00:00 2001 From: waxfrenzy Date: Sun, 10 Nov 2002 02:52:03 +0000 Subject: [PATCH] Removed some cruft --- .../Plugins/LADSPAPlugin/LADSPAPlugin.C | 139 ++++++------------ .../Plugins/LADSPAPlugin/LADSPAPlugin.h | 35 +---- .../Plugins/LADSPAPlugin/LADSPAPluginGUI.h | 2 - 3 files changed, 50 insertions(+), 126 deletions(-) diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C index cbc9e6d..2708687 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.C @@ -202,7 +202,7 @@ void LADSPAPlugin::StreamOut(ostream &s) case 4: { s<::iterator i=m_PortMin.begin(); - i!=m_PortMin.end(); i++) - { - s<<*i<<" "; - } - for (vector::iterator i=m_PortMax.begin(); - i!=m_PortMax.end(); i++) - { - s<<*i<<" "; - } - for (vector::iterator i=m_PortClamp.begin(); - i!=m_PortClamp.end(); i++) - { - s<<*i<<" "; - } +// s<::iterator i=m_PortMin.begin(); +// i!=m_PortMin.end(); i++) +// { +// s<<*i<<" "; +// } +// for (vector::iterator i=m_PortMax.begin(); +// i!=m_PortMax.end(); i++) +// { +// s<<*i<<" "; +// } +// for (vector::iterator i=m_PortClamp.begin(); +// i!=m_PortClamp.end(); i++) +// { +// s<<*i<<" "; +// } } break; case 2: { - s<::iterator i=m_PortMin.begin(); - i!=m_PortMin.end(); i++) - { - s<<*i<<" "; - } - for (vector::iterator i=m_PortMax.begin(); - i!=m_PortMax.end(); i++) - { - s<<*i<<" "; - } +// s<::iterator i=m_PortMin.begin(); +// i!=m_PortMin.end(); i++) +// { +// s<<*i<<" "; +// } +// for (vector::iterator i=m_PortMax.begin(); +// i!=m_PortMax.end(); i++) +// { +// s<<*i<<" "; +// } } break; - case 1: { - s<UniqueID; - m_CurrentPlugin.Name=PlugDesc->Name; - m_CurrentPlugin.Maker=PlugDesc->Maker; - - m_CurrentPlugin.Ports.clear(); - m_PluginInfo.PortTips.clear(); string desc; @@ -539,10 +505,6 @@ bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool PortClampReset) (LADSPA_IS_PORT_CONTROL(PlugDesc->PortDescriptors[i]) ? " (CV)" : " (AU)"); m_PluginInfo.PortTips.push_back(desc.c_str()); - LPluginInfo::LPortDetails PortDetails; - PortDetails.Name=m_PluginInfo.PortTips[c].c_str(); - m_CurrentPlugin.Ports.push_back(PortDetails); - c++; } } @@ -592,34 +554,31 @@ bool LADSPAPlugin::UpdatePlugin(unsigned long UniqueID, bool PortClampReset) m_PortMin.push_back(Min); m_PortMax.push_back(Max); -// PortClamp defaults to true m_PortClamp.push_back(true); - - m_CurrentPlugin.Ports[n].Min=Min; - m_CurrentPlugin.Ports[n].Max=Max; - m_CurrentPlugin.Ports[n].Clamped=true; } } - m_InputPortCount = m_PluginInfo.NumInputs; int lbl_length; char *lbl_start; - lbl_length = m_CurrentPlugin.Name.size(); + m_UniqueID = PlugDesc->UniqueID; + m_InputPortCount = m_PluginInfo.NumInputs; + + lbl_length = strlen(PlugDesc->Name); lbl_length = lbl_length > 255 ? 255 : lbl_length; - strncpy(m_Name, m_CurrentPlugin.Name.substr(0, lbl_length).c_str(), lbl_length); + strncpy(m_Name, PlugDesc->Name, lbl_length); m_Name[lbl_length] = '\0'; - lbl_length = m_CurrentPlugin.Maker.size(); + lbl_length = strlen(PlugDesc->Maker); lbl_length = lbl_length > 255 ? 255 : lbl_length; - strncpy(m_Maker, m_CurrentPlugin.Maker.substr(0, lbl_length).c_str(), 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_CurrentPlugin.Ports[n].Name.size(); + lbl_length = m_PluginInfo.PortTips[n].size(); lbl_length = lbl_length > 255 ? 255 : lbl_length; - strncpy(lbl_start, m_CurrentPlugin.Ports[n].Name.substr(0, lbl_length).c_str(), lbl_length); + strncpy(lbl_start, m_PluginInfo.PortTips[n].c_str(), lbl_length); lbl_start[lbl_length] = '\0'; lbl_start += 256; diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h index 2138f15..cd67317 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPlugin.h @@ -26,37 +26,6 @@ static const unsigned int NUM_PORTS = 8; -class LPluginInfo { -public: - unsigned long UniqueID; - string Filename; - string Label; - string Name; - string Maker; - unsigned long InputPortCount; - - struct LPortDetails - { - string Name; - float Min, Max; - bool Clamped; - }; - - vector Ports; - - bool operator<(const LPluginInfo & li) { return (Name < li.Name); } - bool operator==(const LPluginInfo& li) { return (Name == li.Name); } -}; - -// For sorting vectors of LPluginInfo's -struct LPluginInfoSortAsc -{ - bool operator()(const LPluginInfo & begin, const LPluginInfo & end) - { - return begin.Name < end.Name; - } -}; - struct PortRange { float Min; @@ -100,7 +69,6 @@ private: bool UpdatePlugin(unsigned long UniqueID, bool PortClampReset=true); void SetPortInfo(void); - friend void describePluginLibrary(const char * pcFullFilename, void * pvPluginHandle, LADSPA_Descriptor_Function pfDescriptorFunction); void LoadPluginList(void); void * PlugHandle; @@ -119,8 +87,7 @@ private: // our database of ladspa plugins LADSPAInfo m_LADSPAInfo; - vector m_LADSPAList; - LPluginInfo m_CurrentPlugin; + unsigned long m_UniqueID; float m_Gain; bool m_Amped; diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h index a121196..e5e2adc 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAPluginGUI.h @@ -68,8 +68,6 @@ public: void GetMinMax(int n, float &min, float &max, bool &clamp); private: - LPluginInfo m_CurrentPlugin; - Fl_Scroll *m_InputScroll; Fl_Pack *m_InputPack; Fl_Hold_Browser *m_Browser;