From 1f5f632e687ed3886b43e44019e8ec8068fa91c9 Mon Sep 17 00:00:00 2001 From: waxfrenzy Date: Tue, 28 Jan 2003 19:03:30 +0000 Subject: [PATCH] ifdef'd any rdf stuff - until it's all sorted --- SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C | 12 ++++++++++++ SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h | 2 ++ SpiralSound/Plugins/LADSPAPlugin/Makefile.in | 2 +- 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C b/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C index f104f5c..4c15473 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.C @@ -32,7 +32,11 @@ #include #include + +#ifdef HAVE_LIBLRDF #include +#endif + #include "LADSPAInfo.h" using namespace std; @@ -47,7 +51,9 @@ LADSPAInfo::LADSPAInfo(bool override, } m_LADSPAPathOverride = override; +#ifdef HAVE_LIBLRDF lrdf_init(); +#endif RescanPlugins(); } @@ -112,6 +118,7 @@ LADSPAInfo::RescanPlugins(void) } else { cerr << m_Plugins.size() << " plugins found in " << m_Libraries.size() << " libraries" << endl; +#ifdef HAVE_LIBLRDF // Got some plugins. Now search for RDF data char *rdf_path = getenv("LADSPA_RDF_PATH"); @@ -122,6 +129,7 @@ LADSPAInfo::RescanPlugins(void) // Examine rdf info ScanPathList(rdf_path, &LADSPAInfo::ExamineRDFFile); } +#endif } // Sort list by name @@ -298,7 +306,9 @@ LADSPAInfo::CleanUp(void) m_Libraries.clear(); m_Paths.clear(); +#ifdef HAVE_LIBLRDF lrdf_cleanup(); +#endif m_OrderedPluginList.clear(); m_MaxInputPortCount = 0; @@ -491,6 +501,7 @@ LADSPAInfo::ExaminePluginLibrary(const string path, } } +#ifdef HAVE_LIBLRDF // Examine given RDF plugin meta-data file void LADSPAInfo::ExamineRDFFile(const std::string path, @@ -502,6 +513,7 @@ LADSPAInfo::ExamineRDFFile(const std::string path, cerr << "WARNING: File " << path + basename << " could not be parsed [Ignored]" << endl; } } +#endif bool LADSPAInfo::CheckPlugin(const LADSPA_Descriptor *desc) diff --git a/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h b/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h index b4fe9af..fd36327 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h +++ b/SpiralSound/Plugins/LADSPAPlugin/LADSPAInfo.h @@ -98,8 +98,10 @@ private: const std::string)); void ExaminePluginLibrary(const std::string path, const std::string basename); +#ifdef HAVE_LIBLRDF void ExamineRDFFile(const std::string path, const std::string basename); +#endif bool CheckPlugin(const LADSPA_Descriptor *desc); LADSPA_Descriptor_Function GetDescriptorFunctionForLibrary(unsigned long library_index); diff --git a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in index 5063c70..066484a 100644 --- a/SpiralSound/Plugins/LADSPAPlugin/Makefile.in +++ b/SpiralSound/Plugins/LADSPAPlugin/Makefile.in @@ -14,7 +14,7 @@ CXXFLAGS= @CXXFLAGS@ INCPATH = -I/usr/X11R6/include LINK = g++ -shared LFLAGS = -LIBS = @FLTK_LIBS@ -L/usr/X11R6/lib -lGL -lXext -lX11 -ldl -llrdf +LIBS = @FLTK_LIBS@ -L/usr/X11R6/lib -lGL -lXext -lX11 -ldl #-llrdf MOC = moc UIC =