Yet more fixes for clean shutdown.

[nageru] / image_input.h

diff --git a/image_input.h b/image_input.h
index fbda72de6c36ddf69f660db77b78024afb5fc8cb..659404ea7c5954a191aeda2faf72e3ef774544e7 100644 (file)
--- a/image_input.h
+++ b/image_input.h
@@ -20,7 +20,8 @@ public:
 
        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;
-
+       static void shutdown_updaters();
+       
 private:
        struct Image {
                std::unique_ptr<uint8_t[]> pixels;
@@ -36,6 +37,7 @@ private:
        static std::mutex all_images_lock;
        static std::map<std::string, std::shared_ptr<const Image>> all_images;
        static std::map<std::string, std::thread> update_threads;
+       static volatile bool threads_should_quit;
 };
 
 #endif // !defined(_IMAGE_INPUT_H)