X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=diffusion_effect.h;h=64b94dd8dad11df184e3fb082ec622ab13186644;hp=624990cbd664d90cd2e6d9ce2649bed96fecb10d;hb=95edbfccb0843da3cc105dadc5bc6d8e102f6071;hpb=e655afd53f2e56938bd4e7f72640eff56ef4a1ee

diff --git a/diffusion_effect.h b/diffusion_effect.h
index 624990c..64b94dd 100644
--- a/diffusion_effect.h
+++ b/diffusion_effect.h
@@ -1,5 +1,5 @@
-#ifndef _DIFFUSION_EFFECT_H
-#define _DIFFUSION_EFFECT_H 1
+#ifndef _MOVIT_DIFFUSION_EFFECT_H
+#define _MOVIT_DIFFUSION_EFFECT_H 1
 
 // There are many different effects that go under the name of "diffusion",
 // seemingly all of the inspired by the effect you get when you put a
@@ -12,14 +12,23 @@
 // where we first blur the picture, and then overlay it on the original
 // using the original as a matte.
 
+#include <epoxy/gl.h>
+#include <assert.h>
+#include <string>
+
 #include "effect.h"
 
+namespace movit {
+
 class BlurEffect;
+class EffectChain;
+class Node;
 class OverlayMatteEffect;
 
 class DiffusionEffect : public Effect {
 public:
 	DiffusionEffect();
+	~DiffusionEffect();
 	virtual std::string effect_type_id() const { return "DiffusionEffect"; }
 
 	virtual void rewrite_graph(EffectChain *graph, Node *self);
@@ -35,6 +44,7 @@ public:
 private:
 	BlurEffect *blur;
 	OverlayMatteEffect *overlay_matte;
+	bool owns_overlay_matte;
 };
 
 // Used internally by DiffusionEffect; combines the blurred and the original
@@ -44,6 +54,7 @@ public:
 	OverlayMatteEffect();
 	virtual std::string effect_type_id() const { return "OverlayMatteEffect"; }
 	std::string output_fragment_shader();
+	virtual AlphaHandling alpha_handling() const { return INPUT_PREMULTIPLIED_ALPHA_KEEP_BLANK; }
 
 	unsigned num_inputs() const { return 2; }
 
@@ -51,5 +62,6 @@ private:
 	float blurred_mix_amount;
 };
 
+}  // namespace movit
 
-#endif // !defined(_DIFFUSION_EFFECT_H)
+#endif // !defined(_MOVIT_DIFFUSION_EFFECT_H)