Move texture uploading out of a lambda.

[nageru] / nageru / scene.h

diff --git a/nageru/scene.h b/nageru/scene.h
index e126ca398c879b405f17d0d1b5ccd55848110152..4388bbe71720b71930d8a078249849c0b2dc645f 100644 (file)
--- a/nageru/scene.h
+++ b/nageru/scene.h
@@ -113,8 +113,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 +202,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);
 };