Move texture uploading out of a lambda.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 2be6689f794b1f57cb47aa986b4789621f088032..507dc01828cafb3fe2524f8187b9f56a9f279e5e 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -78,6 +78,7 @@ 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];
 };
@@ -105,11 +106,11 @@ public:
        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);
-       void set_wb_for_signal(int signal, float r, float g, float b);
-       movit::RGBTriplet 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, movit::RGBTriplet> white_balance_for_signal;
+       std::unordered_map<int, movit::RGBTriplet> white_balance_for_card;
 
        std::vector<std::string> get_transition_names(float t);
 
@@ -255,7 +256,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) {