X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=nageru%2Fscene.h;h=73d24513d08238dccef5c1748d6caced3c06d8c0;hb=a0e57ec99e9dfdd7e79bcf21e8c996dc43b6cb49;hp=e126ca398c879b405f17d0d1b5ccd55848110152;hpb=1bf2b3e600dc5485f4957a419459b997d721e5fa;p=nageru

diff --git a/nageru/scene.h b/nageru/scene.h
index e126ca3..73d2451 100644
--- a/nageru/scene.h
+++ b/nageru/scene.h
@@ -13,11 +13,13 @@
 // (directly to screen, RGBA) or live (Y'CbCr output).
 
 #include <stddef.h>
+#include <array>
 #include <bitset>
 #include <functional>
 #include <map>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 class CEFCapture;
@@ -113,8 +115,8 @@ struct Block {
 	// For LIVE_INPUT* only. We can't just always populate signal_to_connect,
 	// since when we set this, CEF and video signals may not have numbers yet.
 	// FIXME: Perhaps it would be simpler if they just did?
-	enum { CONNECT_NONE, CONNECT_CARD, CONNECT_CEF, CONNECT_VIDEO } signal_type_to_connect = CONNECT_NONE;
-	int card_to_connect = 0;  // For CONNECT_CARD.
+	enum { CONNECT_NONE, CONNECT_SIGNAL, CONNECT_CEF, CONNECT_VIDEO } signal_type_to_connect = CONNECT_NONE;
+	int signal_to_connect = 0;  // For CONNECT_SIGNAL.
 #ifdef HAVE_CEF
 	CEFCapture *cef_to_connect = nullptr;  // For CONNECT_CEF.
 #endif
@@ -202,7 +204,7 @@ public:
 	static int add_input(lua_State *L);
 	static int add_effect(lua_State *L);
 	static int add_optional_effect(lua_State *L);
-	static int add_auto_white_balance(lua_State *L);
+	static int add_white_balance(lua_State *L);
 	static int finalize(lua_State *L);
 };