Nomenclature cleanups around channels, signals and cards.

[nageru] / nageru / theme.h

diff --git a/nageru/theme.h b/nageru/theme.h
index 8e4537351905ae02354010a0a51b86cc2c4dccc3..2be6689f794b1f57cb47aa986b4789621f088032 100644 (file)
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -99,10 +99,10 @@ 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);