X-Git-Url: https://git.sesse.net/?p=movit;a=blobdiff_plain;f=effect.h;h=9d4f247632449cbb2cccaf44000d75343b4b147c;hp=65fdf522af305491ca8e6abb594355aae9934e15;hb=1cc8eb50a9dbd0ef6c187a57ded6364215367cb5;hpb=ad66f9714e4a36008c341355700272a52484a785

diff --git a/effect.h b/effect.h
index 65fdf52..9d4f247 100644
--- a/effect.h
+++ b/effect.h
@@ -1,5 +1,5 @@
-#ifndef _EFFECT_H
-#define _EFFECT_H 1
+#ifndef _MOVIT_EFFECT_H
+#define _MOVIT_EFFECT_H 1
 
 // Effect is the base class for every effect. It basically represents a single
 // GLSL function, with an optional set of user-settable parameters.
@@ -16,7 +16,7 @@
 #include <map>
 #include <string>
 
-#include "util.h"
+#include "defs.h"
 
 class EffectChain;
 class Node;
@@ -38,8 +38,8 @@ struct RGBTriplet {
 };
 
 // Can alias on a float[4].
-struct RGBATriplet {
-	RGBATriplet(float r, float g, float b, float a)
+struct RGBATuple {
+	RGBATuple(float r, float g, float b, float a)
 		: r(r), g(g), b(b), a(a) {}
 
 	float r, g, b, a;
@@ -284,4 +284,4 @@ private:
 	std::map<std::string, Texture1D> params_tex_1d;
 };
 
-#endif // !defined(_EFFECT_H)
+#endif // !defined(_MOVIT_EFFECT_H)