X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fimage_input.h;h=6ccdd128cdd15159f4806f2f98f87f60a0f3ba80;hb=1924bea4fde26067d8ee81cfd12f2dd66c5b2cad;hp=f7289f3164e647358722ad5c021d75fa7f881c3e;hpb=533f00a9b992d06767737f9db236b4cf76b9c124;p=nageru

diff --git a/nageru/image_input.h b/nageru/image_input.h
index f7289f3..6ccdd12 100644
--- a/nageru/image_input.h
+++ b/nageru/image_input.h
@@ -14,34 +14,44 @@
 #include <thread>
 
 #include "ref_counted_texture.h"
+#include "tweaked_inputs.h"
 
 class QSurface;
 
 // An output that takes its input from a static image, loaded with ffmpeg.
 // comes from a single 2D array with chunky pixels. The image is refreshed
 // from disk about every second.
-class ImageInput : public movit::FlatInput {
+class ImageInput : public sRGBSwitchingFlatInput {
 public:
+	// For loading images.
 	// NOTE: You will need to call start_update_thread() yourself, once per program.
+	struct Image {
+		unsigned width, height;
+		RefCountedTexture tex;
+		timespec last_modified;
+	};
+	static std::shared_ptr<const Image> load_image(const std::string &filename, const std::string &pathname);
+
+	// Actual members.
+
+	ImageInput();  // Construct an empty input, which can't be used until you call switch_image().
 	ImageInput(const std::string &filename);
 
 	std::string effect_type_id() const override { return "ImageInput"; }
 	void set_gl_state(GLuint glsl_program_num, const std::string& prefix, unsigned *sampler_num) override;
 
+	// Switch to a different image. The image must be previously loaded using load_image().
+	void switch_image(const std::string &pathname);
+
+	std::string get_pathname() const { return pathname; }
+
 	static void start_update_thread(QSurface *surface);
 	static void end_update_thread();
 	
 private:
-	struct Image {
-		unsigned width, height;
-		RefCountedTexture tex;
-		timespec last_modified;
-	};
-
 	std::string pathname;
 	std::shared_ptr<const Image> current_image;
 
-	static std::shared_ptr<const Image> load_image(const std::string &filename, const std::string &pathname);
 	static std::shared_ptr<const Image> load_image_raw(const std::string &pathname);
 	static void update_thread_func(QSurface *surface);
 	static std::mutex all_images_lock;