When deciding which signal to connect, delay the mapping to cards.

[nageru] / nageru / scene.h

diff --git a/nageru/scene.h b/nageru/scene.h
index e126ca398c879b405f17d0d1b5ccd55848110152..4e1181bbf4cf9f504625d5eae9708db79a057ba1 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