X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=flat_input.h;h=dec0f1c2ea2498b2eb9d30af1a319a0de07c7883;hp=33c685bcacd6fa9c30487ea35b18f07f5f28d455;hb=ca4d87878bb32c7d672ac00f41ca0292f19acfcb;hpb=ecab6f3b08bc0a995dd96542758031f1ba2c6a27

diff --git a/flat_input.h b/flat_input.h
index 33c685b..dec0f1c 100644
--- a/flat_input.h
+++ b/flat_input.h
@@ -11,6 +11,8 @@
 #include "init.h"
 #include "input.h"
 
+namespace movit {
+
 class ResourcePool;
 
 // A FlatInput is the normal, “classic” case of an input, where everything
@@ -22,11 +24,6 @@ public:
 
 	virtual std::string effect_type_id() const { return "FlatInput"; }
 
-	// Create the texture itself. We cannot do this in the constructor,
-	// because we don't necessarily know all the settings (sRGB texture,
-	// mipmap generation) at that point.
-	void finalize();
-
 	virtual bool can_output_linear_gamma() const {
 		return (movit_srgb_textures_supported &&
 		        type == GL_UNSIGNED_BYTE &&
@@ -86,14 +83,11 @@ public:
 		invalidate_pixel_data();
 	}
 
-	void invalidate_pixel_data()
-	{
-		needs_update = true;
-	}
+	void invalidate_pixel_data();
 
 	void set_pitch(unsigned pitch) {
-		assert(!finalized);
 		this->pitch = pitch;
+		invalidate_pixel_data();
 	}
 
 	virtual void inform_added(EffectChain *chain)
@@ -104,13 +98,14 @@ public:
 private:
 	ImageFormat image_format;
 	MovitPixelFormat pixel_format;
-	GLenum format, type;
+	GLenum type;
 	GLuint pbo, texture_num;
-	bool needs_update, finalized;
 	int output_linear_gamma, needs_mipmaps;
 	unsigned width, height, pitch;
 	const void *pixel_data;
 	ResourcePool *resource_pool;
 };
 
+}  // namespace movit
+
 #endif // !defined(_MOVIT_FLAT_INPUT_H)