Third step to scan directories provided by plugable providers.

3 files changed, 17 insertions, 3 deletions

diff --git a/include/media/mediaManager.h b/include/media/mediaManager.h
index b0cac0a..265e024 100644
--- a/include/media/mediaManager.h
+++ b/include/media/mediaManager.h
@@ -8,7 +8,6 @@
 #ifndef MEDIAMANAGER_H_
 #define MEDIAMANAGER_H_
 
-#include "../../include/pluginManager.h"
 #include "../../include/plugin.h"
 #include "../../include/tools.h"
 #include <vdr/thread.h>
@@ -21,6 +20,7 @@
 namespace upnp {
 
 class cResourceStreamer;
+class cPluginManager;
 
 class cMediaManager : public cThread {
   friend void cUPnPResourceProvider::OnContainerUpdate(const string& uri, long updateID, const string& target = string());
diff --git a/include/plugin.h b/include/plugin.h
index 4016db0..5607a7e 100644
--- a/include/plugin.h
+++ b/include/plugin.h
@@ -164,6 +164,18 @@ public:
     uint32_t  GetNrAudioChannels() const { return nrAudioChannels; }
     uint32_t  GetColorDepth() const { return colorDepth; }
 
+    /**
+     * Compares a resource with another resource
+     *
+     * This returns true if and only if the resource uri of the
+     * compared two resources are equal.
+     *
+     * It is illegal to have two distinct resources with the
+     * same resource uri even if one of them is a converted or
+     * transcoded version of the other one.
+     */
+    bool operator==(const Resource& rhs);
+
   private:
     string    resourceUri;
     string    protocolInfo;
diff --git a/include/server.h b/include/server.h
index 48e85a9..7d9e479 100644
--- a/include/server.h
+++ b/include/server.h
@@ -9,16 +9,18 @@
 #define SERVER_H_
 
 #include <string>
+#include <map>
+#include <list>
 #include <upnp/upnp.h>
 #include "../include/config.h"
-#include "../include/service.h"
-#include "../include/webserver.h"
 
 using namespace std;
 
 namespace upnp {
 
 class cMediaManager;
+class cWebserver;
+class cUPnPService;
 
 class cMediaServer {
 public: