X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=image_input.h;h=11c94ce9b626ce65f5fde9a2af895e1fa35de8ad;hb=refs%2Fheads%2Fmultichannel_audio;hp=659404ea7c5954a191aeda2faf72e3ef774544e7;hpb=7017a3bd997cbf5d7c327187afecfecd610bf24d;p=nageru

diff --git a/image_input.h b/image_input.h
index 659404e..11c94ce 100644
--- a/image_input.h
+++ b/image_input.h
@@ -1,22 +1,23 @@
 #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 <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 &filename);
+	ImageInput(const std::string &pathname);
 
 	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;
@@ -28,12 +29,12 @@ private:
 		timespec last_modified;
 	};
 
-	std::string filename;
+	std::string pathname;
 	std::shared_ptr<const Image> current_image;
 
-	static std::shared_ptr<const Image> load_image(const std::string &filename);
-	static std::shared_ptr<const Image> load_image_raw(const std::string &filename);
-	static void update_thread_func(const std::string &filename, const timespec &first_modified);
+	static std::shared_ptr<const Image> load_image(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 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;