Rework the chain concept.

[nageru] / nageru / image_input.h

diff --git a/nageru/image_input.h b/nageru/image_input.h
index 32fd52913a6cf2b930e6866772c0592ab004e89f..6ccdd128cdd15159f4806f2f98f87f60a0f3ba80 100644 (file)
--- a/nageru/image_input.h
+++ b/nageru/image_input.h
@@ -23,26 +23,35 @@ class QSurface;
 // from disk about every second.
 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;