Improved plugin loader. This makes linking of the upnp plugin from sub plugins obsolete.

2 files changed, 2 insertions, 3 deletions

diff --git a/include/media/mediaManager.h b/include/media/mediaManager.h
index f7d803c..40aa49f 100644
--- a/include/media/mediaManager.h
+++ b/include/media/mediaManager.h
@@ -57,7 +57,6 @@ public:
   cMediaManager();
   virtual ~cMediaManager();
 
-  void SetPluginDirectory(const string& directory);
   void SetDatabaseDir(const string& file);
 
   bool Initialise();
@@ -95,7 +94,6 @@ private:
   IdList            eventedContainerUpdateIDs;
   StringList        scanTargets;
   string            databaseFile;
-  string            pluginDirectory;
   tntdb::Connection connection;
 
   upnp::cPluginManager* pluginManager;
diff --git a/include/pluginManager.h b/include/pluginManager.h
index 563d4fb..f495a5d 100644
--- a/include/pluginManager.h
+++ b/include/pluginManager.h
@@ -25,7 +25,7 @@ public:
   cPluginManager();
   virtual ~cPluginManager();
 
-  bool LoadPlugins(const std::string& directory);
+  bool LoadPlugins();
 
   int Count() const;
 
@@ -64,6 +64,7 @@ private:
   ProviderMap   providerFactory;
   ProfilerList  profilers;
   ProviderList  providers;
+  void*         selfhandle;
 
 };