Nomenclature cleanups around channels, signals and cards.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 46f24892b5569f48dfe9f226331bf5d02f7ddda9..2be6689f794b1f57cb47aa986b4789621f088032 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -99,12 +99,13 @@ public:
        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);
+       void set_wb_for_signal(int signal, float r, float g, float b);
        movit::RGBTriplet get_white_balance_for_signal(int signal);
        std::string get_channel_color(unsigned channel);
 
@@ -195,6 +196,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;