Make number of cards flexible at runtime.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 7fd132544264e8283fbc0bd1d13ec6d6dc05a084..ce232fcfa913acb8d9eaef44c5889b4d42f62c79 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -2,6 +2,7 @@
 #define _THEME_H 1
 
 #include <lua.hpp>
+#include <movit/effect.h>
 #include <movit/flat_input.h>
 #include <movit/ycbcr_input.h>
 #include <stdbool.h>
@@ -77,13 +78,14 @@ struct InputStateInfo {
        unsigned last_width[MAX_VIDEO_CARDS], last_height[MAX_VIDEO_CARDS];
        bool last_interlaced[MAX_VIDEO_CARDS], last_has_signal[MAX_VIDEO_CARDS], last_is_connected[MAX_VIDEO_CARDS];
        unsigned last_frame_rate_nom[MAX_VIDEO_CARDS], last_frame_rate_den[MAX_VIDEO_CARDS];
+       bmusb::PixelFormat last_pixel_format[MAX_VIDEO_CARDS];
        bool has_last_subtitle[MAX_VIDEO_CARDS];
        std::string last_subtitle[MAX_VIDEO_CARDS];
 };
 
 class Theme {
 public:
-       Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool, unsigned num_cards);
+       Theme(const std::string &filename, const std::vector<std::string> &search_dirs, movit::ResourcePool *resource_pool);
        ~Theme();
 
        struct Chain {
@@ -94,23 +96,21 @@ public:
                // for non-interlaced inputs.
                std::vector<RefCountedFrame> input_frames;
        };
-       struct WhiteBalance {
-               float r, g, b;
-       };
 
        Chain get_chain(unsigned num, float t, unsigned width, unsigned height, const InputState &input_state);
 
        int get_num_channels() const { return num_channels; }
-       int map_signal(int signal_num);
-       void set_signal_mapping(int signal_num, int card_num);
+       int map_signal_to_card(int signal_num);
+       void set_signal_mapping(int signal_num, int card_idx);
        std::string get_channel_name(unsigned channel);
-       int get_channel_signal(unsigned channel);
+       int map_channel_to_signal(unsigned channel);
        bool get_supports_set_wb(unsigned channel);
        void set_wb(unsigned channel, float r, float g, float b);
-       WhiteBalance get_white_balance_for_signal(int signal);
+       void set_wb_for_card(int card_idx, float r, float g, float b);
+       movit::RGBTriplet get_white_balance_for_card(int card_idx);
        std::string get_channel_color(unsigned channel);
 
-       std::unordered_map<int, WhiteBalance> white_balance_for_signal;
+       std::unordered_map<int, movit::RGBTriplet> white_balance_for_card;
 
        std::vector<std::string> get_transition_names(float t);
 
@@ -197,6 +197,7 @@ private:
        void register_class(const char *class_name, const luaL_Reg *funcs, EffectType effect_type = NO_EFFECT_TYPE);
        int set_theme_menu(lua_State *L);
        Chain get_chain_from_effect_chain(movit::EffectChain *effect_chain, unsigned num, const InputState &input_state);
+       void call_lua_wb_callback(unsigned channel, float r, float g, float b);
 
        std::string theme_path;
 
@@ -205,7 +206,6 @@ private:
        const InputState *input_state = nullptr;  // Protected by <m>. Only set temporarily, during chain setup.
        movit::ResourcePool *resource_pool;
        int num_channels = -1;
-       unsigned num_cards;
        bool startup_finished = false;
 
        std::mutex map_m;
@@ -255,7 +255,7 @@ public:
        LiveInputWrapper(Theme *theme, movit::EffectChain *chain, bmusb::PixelFormat pixel_format, bool override_bounce, bool deinterlace, bool user_connectable);
 
        bool connect_signal(int signal_num);  // Must be called with the theme's <m> lock held, since it accesses theme->input_state. Returns false on error.
-       void connect_signal_raw(int signal_num, const InputState &input_state);
+       void connect_card(int signal_num, const InputState &input_state);
        movit::Effect *get_effect() const
        {
                if (deinterlace) {