Pull EffectChain a step closer to input resolution independence.

[movit] / main.cpp

diff --git a/main.cpp b/main.cpp
index bc52e1d25b6bb2befb605a2a9e61e6016ac0305c..0340cace0075a596855f76aaf72c4fdd1567a20b 100644 (file)
--- a/main.cpp
+++ b/main.cpp
@@ -18,14 +18,13 @@
 #include <SDL/SDL_opengl.h>
 #include <SDL/SDL_image.h>
 
-#include <GL/gl.h>
-#include <GL/glext.h>
-
 #include "effect.h"
 #include "effect_chain.h"
 #include "util.h"
+#include "opengl.h"
 #include "widgets.h"
 
+#include "flat_input.h"
 #include "lift_gamma_gain_effect.h"
 #include "saturation_effect.h"
 #include "diffusion_effect.h"
@@ -164,11 +163,11 @@ int main(int argc, char **argv)
        EffectChain chain(WIDTH, HEIGHT);
 
        ImageFormat inout_format;
-       inout_format.pixel_format = FORMAT_BGRA;
        inout_format.color_space = COLORSPACE_sRGB;
        inout_format.gamma_curve = GAMMA_sRGB;
 
-       Input *input = chain.add_input(inout_format);
+       FlatInput *input = new FlatInput(inout_format, FORMAT_BGRA, img_w, img_h);
+       chain.add_input(input);
        Effect *lift_gamma_gain_effect = chain.add_effect(new LiftGammaGainEffect());
        Effect *saturation_effect = chain.add_effect(new SaturationEffect());
        Effect *diffusion_effect = chain.add_effect(new DiffusionEffect());