X-Git-Url: http://git.tdb.fi/?p=libs%2Fgl.git;a=blobdiff_plain;f=source%2Fresourcemanager.cpp;h=4b72685d4d4ba6f4594a2349101cc253b9ecd36f;hp=9835adde3e8dd7efffe038f6eeb7f39a7c26101c;hb=3d8438922e24b787587d0c8f1883c5567a4af573;hpb=573ea4e5602c4321cc1d75daf9ed0beed5cde280

diff --git a/source/resourcemanager.cpp b/source/resourcemanager.cpp
index 9835adde..4b72685d 100644
--- a/source/resourcemanager.cpp
+++ b/source/resourcemanager.cpp
@@ -5,7 +5,7 @@
 #include <msp/time/utils.h>
 #include "resourcemanager.h"
 #include "resources.h"
-#include "resourcewatcher.h"
+#include "resourceobserver.h"
 
 using namespace std;
 
@@ -163,21 +163,21 @@ void ResourceManager::remove_resource(Resource &r)
 	else if(state>ManagedResource::LOAD_QUEUED && state<ManagedResource::LOADED)
 		thread.remove_resource(managed);
 
-	for(vector<ResourceWatcher *>::const_iterator i=managed.watchers.begin(); i!=managed.watchers.end(); ++i)
+	for(vector<ResourceObserver *>::const_iterator i=managed.observers.begin(); i!=managed.observers.end(); ++i)
 		(*i)->resource_removed(r);
 
 	MutexLock lock(map_mutex);
 	remove_existing(resources, &r);
 }
 
-void ResourceManager::watch_resource(const Resource &r, ResourceWatcher &w)
+void ResourceManager::observe_resource(const Resource &r, ResourceObserver &w)
 {
-	get_managed_resource(r).add_watcher(w);
+	get_managed_resource(r).add_observer(w);
 }
 
-void ResourceManager::unwatch_resource(const Resource &r, ResourceWatcher &w)
+void ResourceManager::unobserve_resource(const Resource &r, ResourceObserver &w)
 {
-	get_managed_resource(r).remove_watcher(w);
+	get_managed_resource(r).remove_observer(w);
 }
 
 void ResourceManager::tick()
@@ -336,7 +336,7 @@ void ResourceManager::ManagedResource::finish_loading(bool successful)
 		state = LOADED;
 		data_size = resource->get_data_size();
 
-		for(vector<ResourceWatcher *>::const_iterator i=watchers.begin(); i!=watchers.end(); ++i)
+		for(vector<ResourceObserver *>::const_iterator i=observers.begin(); i!=observers.end(); ++i)
 			(*i)->resource_loaded(*resource);
 	}
 	else
@@ -356,21 +356,21 @@ void ResourceManager::ManagedResource::unload()
 	resource->unload();
 	state = NOT_LOADED;
 
-	for(vector<ResourceWatcher *>::const_iterator i=watchers.begin(); i!=watchers.end(); ++i)
+	for(vector<ResourceObserver *>::const_iterator i=observers.begin(); i!=observers.end(); ++i)
 		(*i)->resource_unloaded(*resource);
 }
 
-void ResourceManager::ManagedResource::add_watcher(ResourceWatcher &w)
+void ResourceManager::ManagedResource::add_observer(ResourceObserver &w)
 {
-	if(find(watchers.begin(), watchers.end(), &w)==watchers.end())
-		watchers.push_back(&w);
+	if(find(observers.begin(), observers.end(), &w)==observers.end())
+		observers.push_back(&w);
 }
 
-void ResourceManager::ManagedResource::remove_watcher(ResourceWatcher &w)
+void ResourceManager::ManagedResource::remove_observer(ResourceObserver &w)
 {
-	vector<ResourceWatcher *>::iterator end = remove(watchers.begin(), watchers.end(), &w);
-	if(end!=watchers.end())
-		watchers.erase(end, watchers.end());
+	vector<ResourceObserver *>::iterator end = remove(observers.begin(), observers.end(), &w);
+	if(end!=observers.end())
+		observers.erase(end, observers.end());
 }