Generalize find_control_protocol_resource

jonathan-r-thorpe · jonathan-r-thorpe · commit 8210589008a0 · 2024-09-04T16:17:56.000+01:00
diff --git a/Development/nmos/control_protocol_utils.cpp b/Development/nmos/control_protocol_utils.cpp
@@ -623,8 +623,7 @@ namespace nmos
                 auto found_tp = std::find_if(tps.begin(), tps.end(), [resource_id](const web::json::value& touchpoint)
                 {
                     auto& resource = nmos::fields::nc::resource(touchpoint);
-                    return (resource_id == nmos::fields::nc::id(resource).as_string()
-                        && nmos::ncp_touchpoint_resource_types::receiver.name == nmos::fields::nc::resource_type(resource));
+                    return (resource_id == nmos::fields::nc::id(resource).as_string());
                 });
                 return (tps.end() != found_tp);
             }

Original file line number	Diff line number	Diff line change
`@@ -623,8 +623,7 @@ namespace nmos`
`623`	`623`	`auto found_tp = std::find_if(tps.begin(), tps.end(), [resource_id](const web::json::value& touchpoint)`
`624`	`624`	`{`
`625`	`625`	`auto& resource = nmos::fields::nc::resource(touchpoint);`
`626`		`- return (resource_id == nmos::fields::nc::id(resource).as_string()`
`627`		`- && nmos::ncp_touchpoint_resource_types::receiver.name == nmos::fields::nc::resource_type(resource));`
	`626`	`+ return (resource_id == nmos::fields::nc::id(resource).as_string());`
`628`	`627`	`});`
`629`	`628`	`return (tps.end() != found_tp);`
`630`	`629`	`}`