X-Git-Url: https://git.sesse.net/?p=nageru;a=blobdiff_plain;f=image_input.h;h=02be497ff40e2dccee5f569a5be2e1e98a6ae4c5;hp=3b3c1873763577c2250a48b883cc214b04620592;hb=703e00da89118df9be0354dda621bed023e6030e;hpb=2db049365fa301d2cdcb29a1dcdf958a276ff1c1

diff --git a/image_input.h b/image_input.h
index 3b3c187..02be497 100644
--- a/image_input.h
+++ b/image_input.h
@@ -1,22 +1,24 @@
 #ifndef _IMAGE_INPUT_H
 #define _IMAGE_INPUT_H 1
 
+#include <epoxy/gl.h>
+#include <movit/flat_input.h>
+#include <stdbool.h>
+#include <time.h>
+#include <condition_variable>
+#include <cstdint>
 #include <map>
 #include <memory>
 #include <mutex>
 #include <string>
 #include <thread>
 
-#include <time.h>
-
-#include <movit/flat_input.h>
-
 // 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 {
 public:
-	ImageInput(const std::string &pathname);
+	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;
@@ -24,20 +26,24 @@ public:
 	
 private:
 	struct Image {
+		unsigned width, height;
 		std::unique_ptr<uint8_t[]> pixels;
 		timespec last_modified;
 	};
 
-	std::string pathname;
+	std::string filename, pathname;
 	std::shared_ptr<const Image> current_image;
 
-	static std::shared_ptr<const Image> load_image(const std::string &pathname);
+	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(const std::string &pathname, const timespec &first_modified);
+	static void update_thread_func(const std::string &filename, const std::string &pathname, const timespec &first_modified);
 	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;
+
+	static std::mutex threads_should_quit_mu;
+	static bool threads_should_quit;  // Under threads_should_quit_mu.
+	static std::condition_variable threads_should_quit_modified;  // Signals when threads_should_quit is set.
 };
 
 #endif // !defined(_IMAGE_INPUT_H)