X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Ftheme.h;fp=nageru%2Ftheme.h;h=fe713ef1f6da48df468d4923c03a5451e23d1f27;hb=1bf2b3e600dc5485f4957a419459b997d721e5fa;hp=2be6689f794b1f57cb47aa986b4789621f088032;hpb=0490c42536a845dd6d718a7c58cfb3e3ab02b1ab;p=nageru diff --git a/nageru/theme.h b/nageru/theme.h index 2be6689..fe713ef 100644 --- a/nageru/theme.h +++ b/nageru/theme.h @@ -105,11 +105,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 white_balance_for_signal; + std::unordered_map white_balance_for_card; std::vector 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 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) {