X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=resample_effect.h;h=4cde466c2d85de4a4b81bb5880399c197a11d63e;hp=7538a68c143e8bd29cdac1078b94bd456bf2c9f6;hb=e683d4e49549b2d4c6906d2ebc4184904f4fe9f8;hpb=1fb55b14a6c694e082f0261e86f26d4f82948821

diff --git a/resample_effect.h b/resample_effect.h
index 7538a68..4cde466 100644
--- a/resample_effect.h
+++ b/resample_effect.h
@@ -49,69 +49,72 @@ ScalingWeights calculate_scaling_weights(unsigned src_size, unsigned dst_size, f
 class ResampleEffect : public Effect {
 public:
 	ResampleEffect();
+	~ResampleEffect();
 
-	virtual std::string effect_type_id() const { return "ResampleEffect"; }
+	std::string effect_type_id() const override { return "ResampleEffect"; }
 
 	// We want this for the same reason as ResizeEffect; we could end up scaling
 	// down quite a lot.
-	virtual bool needs_texture_bounce() const { return true; }
-	virtual bool needs_srgb_primaries() const { return false; }
+	bool needs_texture_bounce() const override { return true; }
+	bool needs_srgb_primaries() const override { return false; }
 
-	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height);
+	void inform_input_size(unsigned input_num, unsigned width, unsigned height) override;
 
-	virtual std::string output_fragment_shader() {
+	std::string output_fragment_shader() override {
 		assert(false);
 	}
-	virtual void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) {
+	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override {
 		assert(false);
 	}
 
-	virtual void rewrite_graph(EffectChain *graph, Node *self);
-	virtual bool set_float(const std::string &key, float value);
+	void rewrite_graph(EffectChain *graph, Node *self) override;
+	bool set_float(const std::string &key, float value) override;
 	
 private:
 	void update_size();
 	void update_offset_and_zoom();
 	
+	// Both of these are owned by us if owns_effects is true (before finalize()),
+	// and otherwise owned by the EffectChain.
+	bool owns_effects;
 	SingleResamplePassEffect *hpass, *vpass;
 	int input_width, input_height, output_width, output_height;
 
 	float offset_x, offset_y;
 	float zoom_x, zoom_y;
 	float zoom_center_x, zoom_center_y;
-	float unused;
 };
 
 class SingleResamplePassEffect : public Effect {
 public:
-	// If parent is non-NULL, calls to inform_input_size will be forwarded,
+	// If parent is non-nullptr, calls to inform_input_size will be forwarded,
 	// so that it can inform both passes about the right input and output
 	// resolutions.
 	SingleResamplePassEffect(ResampleEffect *parent);
 	~SingleResamplePassEffect();
-	virtual std::string effect_type_id() const { return "SingleResamplePassEffect"; }
+	std::string effect_type_id() const override { return "SingleResamplePassEffect"; }
 
-	std::string output_fragment_shader();
+	std::string output_fragment_shader() override;
 
-	virtual bool needs_texture_bounce() const { return true; }
-	virtual bool needs_srgb_primaries() const { return false; }
-	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
+	bool needs_texture_bounce() const override { return true; }
+	bool needs_srgb_primaries() const override { return false; }
+	AlphaHandling alpha_handling() const override { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
-	virtual void inform_added(EffectChain *chain) { this->chain = chain; }
-	virtual void inform_input_size(unsigned input_num, unsigned width, unsigned height) {
-		if (parent != NULL) {
+	void inform_added(EffectChain *chain) override { this->chain = chain; }
+	void inform_input_size(unsigned input_num, unsigned width, unsigned height) override {
+		if (parent != nullptr) {
 			parent->inform_input_size(input_num, width, height);
 		}
 	}
-	virtual bool changes_output_size() const { return true; }
-	virtual bool sets_virtual_output_size() const { return false; }
+	bool changes_output_size() const override { return true; }
+	bool sets_virtual_output_size() const override { return false; }
 
-	virtual void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const {
+	void get_output_size(unsigned *width, unsigned *height, unsigned *virtual_width, unsigned *virtual_height) const override {
 		*virtual_width = *width = this->output_width;
 		*virtual_height = *height = this->output_height;
 	}
 
-	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num);
+	void set_gl_state(GLuint glsl_program_num, const std::string &prefix, unsigned *sampler_num) override;
 	
 	enum Direction { HORIZONTAL = 0, VERTICAL = 1 };
 
@@ -129,7 +132,6 @@ private:
 
 	int input_width, input_height, output_width, output_height;
 	float offset, zoom;
-	float unused;
 	int last_input_width, last_input_height, last_output_width, last_output_height;
 	float last_offset, last_zoom;
 	int src_bilinear_samples, num_loops;