X-Git-Url: http://git.tdb.fi/?p=libs%2Fgui.git;a=blobdiff_plain;f=source%2Fgraphics%2Fimageloader.h;h=cb3f54ac204f303afe23e5bfc30b111ece28f33a;hp=85e6b5200479a3f2814403b4b2a532fd06d1723d;hb=2ebdf45974a0a7649b3488f9da4b8cf90a1db584;hpb=0885a7e155653acbbc1b15eff590feabbb6f00d9

diff --git a/source/graphics/imageloader.h b/source/graphics/imageloader.h
index 85e6b52..cb3f54a 100644
--- a/source/graphics/imageloader.h
+++ b/source/graphics/imageloader.h
@@ -23,11 +23,18 @@ public:
 
 class ImageLoader
 {
+public:
+	enum State
+	{
+		INITIAL,
+		FINISHED
+	};
+
 protected:
 	class RegisterBase
 	{
 	protected:
-		RegisterBase();
+		RegisterBase() { }
 	public:
 		virtual ~RegisterBase() { }
 
@@ -36,12 +43,27 @@ protected:
 		virtual ImageLoader *create(IO::Seekable &) const = 0;
 	};
 
+	template<typename T>
+	class RegisteredLoader: public RegisterBase
+	{
+	public:
+		virtual unsigned get_signature_size() const { return T::get_signature_size(); }
+		virtual bool detect(const std::string &s) const { return T::detect(s); }
+		virtual ImageLoader *create(IO::Seekable &io) const { return new T(io); }
+	};
+
+	struct Registry
+	{
+		std::list<RegisterBase *> loaders;
+		bool changed;
+
+		Registry();
+		~Registry();
+	};
+
 private:
 	IO::Base *source;
-
-	static std::list<RegisterBase *> &get_registered_loaders();
-	static bool registered_loaders_changed;
-	static bool signature_size_compare(RegisterBase *, RegisterBase *);
+	State state;
 
 protected:
 	ImageLoader();
@@ -51,30 +73,28 @@ public:
 	static ImageLoader *open_file(const std::string &);
 	static ImageLoader *open_io(IO::Seekable &);
 
-	virtual void load(Image::Data &) = 0;
-};
+	virtual void load(Image::Data &);
+protected:
+	virtual void load_(Image::Data &) = 0;
 
+public:
+	State get_state() const { return state; }
 
-template<typename T>
-class RegisteredImageLoader: public ImageLoader
-{
+	template<typename T>
+	static void register_loader();
 private:
-	class Register: public RegisterBase
-	{
-	public:
-		virtual unsigned get_signature_size() const { return T::get_signature_size(); }
-		virtual bool detect(const std::string &s) const { return T::detect(s); }
-		virtual ImageLoader *create(IO::Seekable &io) const { return new T(io); }
-	};
+	static Registry &get_registry();
 
-	static Register reg;
-
-protected:
-	RegisteredImageLoader() { (void)reg; }
+	static bool signature_size_compare(RegisterBase *, RegisterBase *);
 };
 
 template<typename T>
-typename RegisteredImageLoader<T>::Register RegisteredImageLoader<T>::reg;
+void ImageLoader::register_loader()
+{
+	Registry &registry = get_registry();
+	registry.loaders.push_back(new RegisteredLoader<T>);
+	registry.changed = true;
+}
 
 } // namespace Graphics
 } // namespace Msp