X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=image_input.h;h=437d9c2db72ace8b45de8698d2f61c2147ce3786;hb=7a074a020aad29723e028acab76b9edfdd6c5223;hp=11c94ce9b626ce65f5fde9a2af895e1fa35de8ad;hpb=71480f2d1cd96c1ca5b2888f82bf33d290d60228;p=nageru

diff --git a/image_input.h b/image_input.h
index 11c94ce..437d9c2 100644
--- a/image_input.h
+++ b/image_input.h
@@ -17,7 +17,7 @@
 // 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;
@@ -29,12 +29,12 @@ private:
 		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;