X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.h;h=fe713ef1f6da48df468d4923c03a5451e23d1f27;hb=refs%2Ftags%2F1.9.2;hp=8e4537351905ae02354010a0a51b86cc2c4dccc3;hpb=6cf87ad853439f8565c575fb29dc539a15fdba87;p=nageru

diff --git a/nageru/theme.h b/nageru/theme.h
index 8e45373..fe713ef 100644
--- a/nageru/theme.h
+++ b/nageru/theme.h
@@ -99,17 +99,17 @@ 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);
+	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 +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) {