Make it possible to set width/height on the command line, instead of compiling it...

[nageru] / theme.cpp

diff --git a/theme.cpp b/theme.cpp
index d6c9a239b219556ce8fb2d9d2b7222b538e4ce6e..afe511c9821514cda701b36031cac735d40f5544 100644 (file)
--- a/theme.cpp
+++ b/theme.cpp
@@ -1,17 +1,19 @@
 #include "theme.h"
 
 #include <assert.h>
+#include <bmusb/bmusb.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
 #include <lua.hpp>
 #include <movit/effect.h>
 #include <movit/effect_chain.h>
 #include <movit/image_format.h>
 #include <movit/mix_effect.h>
+#include <movit/multiply_effect.h>
 #include <movit/overlay_effect.h>
 #include <movit/padding_effect.h>
 #include <movit/resample_effect.h>
 #include <movit/resize_effect.h>
-#include <movit/multiply_effect.h>
 #include <movit/util.h>
 #include <movit/white_balance_effect.h>
 #include <movit/ycbcr.h>
@@ -19,14 +21,19 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <cstddef>
+#include <memory>
 #include <new>
 #include <utility>
-#include <memory>
 
 #include "defs.h"
+#include "deinterlace_effect.h"
 #include "flags.h"
 #include "image_input.h"
-#include "mixer.h"
+#include "input.h"
+#include "input_state.h"
+#include "pbo_frame_allocator.h"
+
+class Mixer;
 
 namespace movit {
 class ResourcePool;
@@ -624,9 +631,9 @@ LiveInputWrapper::LiveInputWrapper(Theme *theme, EffectChain *chain, bool overri
        }
        for (unsigned i = 0; i < num_inputs; ++i) {
                if (override_bounce) {
-                       inputs.push_back(new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
+                       inputs.push_back(new NonBouncingYCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
                } else {
-                       inputs.push_back(new YCbCrInput(inout_format, input_ycbcr_format, WIDTH, HEIGHT, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
+                       inputs.push_back(new YCbCrInput(inout_format, input_ycbcr_format, global_flags.width, global_flags.height, YCBCR_INPUT_SPLIT_Y_AND_CBCR));
                }
                chain->add_input(inputs.back());
        }