Re-run IWYU, again with lots of manual cleanup.

[nageru] / theme.h

diff --git a/theme.h b/theme.h
index 49152637975c8d2df8a90325c8f2dbd247a5eebb..2b75aa157c2870665739715a52beee9bf7bc015b 100644 (file)
--- a/theme.h
+++ b/theme.h
@@ -1,16 +1,26 @@
 #ifndef _THEME_H
 #define _THEME_H 1
 
-#include <stdio.h>
-#include <lua.h>
+#include <epoxy/gl.h>
 #include <lauxlib.h>
-
+#include <lua.h>
+#include <movit/effect_chain.h>
+#include <movit/ycbcr_input.h>
+#include <stdbool.h>
+#include <stdio.h>
 #include <functional>
 #include <mutex>
+#include <string>
 #include <utility>
+#include <vector>
 
-#include <movit/effect_chain.h>
-#include <movit/ycbcr_input.h>
+namespace movit {
+class ResourcePool;
+struct ImageFormat;
+struct YCbCrFormat;
+}  // namespace movit
+
+#define MAX_CARDS 16
 
 class NonBouncingYCbCrInput : public movit::YCbCrInput {
 public:
@@ -25,7 +35,7 @@ public:
 
 class Theme {
 public:
-       Theme(const char *filename, movit::ResourcePool *resource_pool);
+       Theme(const char *filename, movit::ResourcePool *resource_pool, unsigned num_cards);
 
        std::pair<movit::EffectChain *, std::function<void()>>
        get_chain(unsigned num, float t, unsigned width, unsigned height);
@@ -50,8 +60,9 @@ private:
        movit::ResourcePool *resource_pool;
        struct {
                GLuint tex_y = 0, tex_cbcr = 0;
-       } input_textures[16];  // FIXME
+       } input_textures[MAX_CARDS];
        int num_channels;
+       unsigned num_cards;
 };
 
 class LiveInputWrapper {