X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fresources%2Fresourcemanager.h;h=e2926be41a82a98ba184c7a6b5194a11a24db4bc;hb=99ca354f18119f82f1adeca100cd665a8f640317;hp=bd87de8929ad92fc38b2703313168d2df1d75628;hpb=38712d8ecc57d043a2419ffbaeeb57f7a6586f14;p=libs%2Fgl.git

diff --git a/source/resources/resourcemanager.h b/source/resources/resourcemanager.h
index bd87de89..e2926be4 100644
--- a/source/resources/resourcemanager.h
+++ b/source/resources/resourcemanager.h
@@ -4,6 +4,7 @@
 #include <deque>
 #include <cstdint>
 #include <msp/core/mutex.h>
+#include <msp/core/noncopyable.h>
 #include <msp/core/semaphore.h>
 #include <msp/core/thread.h>
 #include <msp/datafile/collection.h>
@@ -23,7 +24,7 @@ public:
 };
 
 
-class ResourceManager
+class ResourceManager: public NonCopyable
 {
 public:
 	enum LoadingPolicy
@@ -80,7 +81,7 @@ private:
 	class LoadingThread: public Thread
 	{
 	private:
-		Semaphore sem;
+		Msp::Semaphore sem;
 		Mutex queue_mutex;
 		std::deque<ManagedResource *> async_queue;
 		std::deque<ManagedResource *> sync_queue;
@@ -135,6 +136,7 @@ public:
 	void set_max_retain_frames(unsigned);
 
 	void add_resource(Resource &);
+	void move_resource(Resource &, Resource &);
 private:
 	const ManagedResource &get_managed_resource(const Resource &) const;
 	ManagedResource &get_managed_resource(const Resource &);