Change some class names

[libs/gl.git] / source / resourcemanager.h

diff --git a/source/resourcemanager.h b/source/resourcemanager.h
index afa2c2d073e45b32b25332a91a3be9c7c8568461..9dcd9b997a56a25214ea691d27f2f616197ae55f 100644 (file)
--- a/source/resourcemanager.h
+++ b/source/resourcemanager.h
@@ -11,7 +11,7 @@
 namespace Msp {
 namespace GL {
 
-class ResourceWatcher;
+class ResourceObserver;
 
 class resource_load_error: public std::runtime_error
 {
@@ -62,7 +62,7 @@ private:
                State state;
                unsigned last_used;
                UInt64 data_size;
-               std::vector<ResourceWatcher *> watchers;
+               std::vector<ResourceObserver *> observers;
 
                ManagedResource(Resource &);
 
@@ -72,8 +72,8 @@ private:
                void finish_loading();
                void unload();
 
-               void add_watcher(ResourceWatcher &);
-               void remove_watcher(ResourceWatcher &);
+               void add_observer(ResourceObserver &);
+               void remove_observer(ResourceObserver &);
        };
 
        typedef std::list<ManagedResource *> LoadQueue;
@@ -152,8 +152,12 @@ public:
        void resource_used(const Resource &);
        void remove_resource(Resource &);
 
-       void watch_resource(const Resource &, ResourceWatcher &);
-       void unwatch_resource(const Resource &, ResourceWatcher &);
+       void observe_resource(const Resource &, ResourceObserver &);
+       void unobserve_resource(const Resource &, ResourceObserver &);
+
+       // Deprecated names
+       void watch_resource(const Resource &r, ResourceObserver &o) { observe_resource(r, o); }
+       void unwatch_resource(const Resource &r, ResourceObserver &o) { unobserve_resource(r, o); }
 
        void tick();
 private: