1 files changed, 28 insertions, 22 deletions

diff --git a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc
index 2090841b3b9..526d6b4eb5b 100644
--- a/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc
+++ b/source/blender/nodes/composite/nodes/node_composite_sepcombYCCA.cc
@@ -24,15 +24,19 @@
 #include "node_composite_util.hh"
 
 /* **************** SEPARATE YCCA ******************** */
-static bNodeSocketTemplate cmp_node_sepycca_in[] = {
-    {SOCK_RGBA, N_("Image"), 1.0f, 1.0f, 1.0f, 1.0f}, {-1, ""}};
-static bNodeSocketTemplate cmp_node_sepycca_out[] = {
-    {SOCK_FLOAT, N_("Y")},
-    {SOCK_FLOAT, N_("Cb")},
-    {SOCK_FLOAT, N_("Cr")},
-    {SOCK_FLOAT, N_("A")},
-    {-1, ""},
-};
+
+namespace blender::nodes {
+
+static void cmp_node_sepycca_declare(NodeDeclarationBuilder &b)
+{
+  b.add_input<decl::Color>("Image").default_value({1.0f, 1.0f, 1.0f, 1.0f});
+  b.add_output<decl::Float>("Y");
+  b.add_output<decl::Float>("Cb");
+  b.add_output<decl::Float>("Cr");
+  b.add_output<decl::Float>("A");
+}
+
+}  // namespace blender::nodes
 
 static void node_composit_init_mode_sepycca(bNodeTree *UNUSED(ntree), bNode *node)
 {
@@ -44,24 +48,26 @@ void register_node_type_cmp_sepycca(void)
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_SEPYCCA, "Separate YCbCrA", NODE_CLASS_CONVERTER, 0);
-  node_type_socket_templates(&ntype, cmp_node_sepycca_in, cmp_node_sepycca_out);
+  ntype.declare = blender::nodes::cmp_node_sepycca_declare;
   node_type_init(&ntype, node_composit_init_mode_sepycca);
 
   nodeRegisterType(&ntype);
 }
 
 /* **************** COMBINE YCCA ******************** */
-static bNodeSocketTemplate cmp_node_combycca_in[] = {
-    {SOCK_FLOAT, N_("Y"), 0.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-    {SOCK_FLOAT, N_("Cb"), 0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-    {SOCK_FLOAT, N_("Cr"), 0.5f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-    {SOCK_FLOAT, N_("A"), 1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 1.0f, PROP_NONE},
-    {-1, ""},
-};
-static bNodeSocketTemplate cmp_node_combycca_out[] = {
-    {SOCK_RGBA, N_("Image")},
-    {-1, ""},
-};
+
+namespace blender::nodes {
+
+static void cmp_node_combycca_declare(NodeDeclarationBuilder &b)
+{
+  b.add_input<decl::Float>("Y").min(0.0f).max(1.0f);
+  b.add_input<decl::Float>("Cb").default_value(0.5f).min(0.0f).max(1.0f);
+  b.add_input<decl::Float>("Cr").default_value(0.5f).min(0.0f).max(1.0f);
+  b.add_input<decl::Float>("A").default_value(1.0f).min(0.0f).max(1.0f);
+  b.add_output<decl::Color>("Image");
+}
+
+}  // namespace blender::nodes
 
 static void node_composit_init_mode_combycca(bNodeTree *UNUSED(ntree), bNode *node)
 {
@@ -73,7 +79,7 @@ void register_node_type_cmp_combycca(void)
   static bNodeType ntype;
 
   cmp_node_type_base(&ntype, CMP_NODE_COMBYCCA, "Combine YCbCrA", NODE_CLASS_CONVERTER, 0);
-  node_type_socket_templates(&ntype, cmp_node_combycca_in, cmp_node_combycca_out);
+  ntype.declare = blender::nodes::cmp_node_combycca_declare;
   node_type_init(&ntype, node_composit_init_mode_combycca);
 
   nodeRegisterType(&ntype);