comparison plugin/DSSIPluginFactory.cpp @ 150:4b2ea82fd0ed

* Reorganising code base.  This revision probably should compile once more.

 
 #include "DSSIPluginInstance.h"
 #include "PluginIdentifier.h"
 
 //!!!
-#include "plugins/SamplePlayer.h"
-
-#include "base/System.h"
+#include "plugin/plugins/SamplePlayer.h"
+
+#include "system/System.h"
 
 #ifdef HAVE_LRDF
 #include "lrdf.h"
 #endif // HAVE_LRDF
 

 
     return pathList;
 }
 
 
-#ifdef HAVE_LRDF
 std::vector<QString>
 DSSIPluginFactory::getLRDFPath(QString &baseUri)
 {
+    std::vector<QString> lrdfPaths;
+
+#ifdef HAVE_LRDF
     std::vector<QString> pathList = getPluginPath();
-    std::vector<QString> lrdfPaths;
 
     lrdfPaths.push_back("/usr/local/share/dssi/rdf");
     lrdfPaths.push_back("/usr/share/dssi/rdf");
 
     lrdfPaths.push_back("/usr/local/share/ladspa/rdf");

 #ifdef DSSI_BASE
     baseUri = DSSI_BASE;
 #else
     baseUri = "http://dssi.sourceforge.net/ontology#";
 #endif
+#endif
 
     return lrdfPaths;
 }    
-#endif
 
 
 void
 DSSIPluginFactory::discoverPlugins(QString soname)
 {