Changed ncp_nmos_resource_type to ncp_touchpoint_resource_type

Author: jonathan-r-thorpe

Development/nmos-cpp-node/node_implementation.cpp

@@ -1266,7 +1266,7 @@ void node_implementation_init(nmos::node_model& model, nmos::experimental::contr
                     utility::stringstream_t role;
                     role << U("monitor-") << ++count;
                     const auto& receiver = nmos::find_resource(model.node_resources, receiver_id);
-                    const auto receiver_monitor = nmos::make_receiver_monitor(++oid, true, nmos::root_block_oid, role.str(), nmos::fields::label(receiver->data), nmos::fields::description(receiver->data), value_of({ { nmos::details::make_nc_touchpoint_nmos({nmos::ncp_nmos_resource_types::receiver, receiver_id}) } }));
+                    const auto receiver_monitor = nmos::make_receiver_monitor(++oid, true, nmos::root_block_oid, role.str(), nmos::fields::label(receiver->data), nmos::fields::description(receiver->data), value_of({ { nmos::details::make_nc_touchpoint_nmos({nmos::ncp_touchpoint_resource_types::receiver, receiver_id}) } }));
 
                     // add receiver-monitor to root-block
                     nmos::push_back(root_block, receiver_monitor);

Development/nmos/control_protocol_nmos_resource_type.h

@@ -8,15 +8,15 @@ namespace nmos
 {
     // resourceType
     // See https://specs.amwa.tv/ms-05-02/branches/v1.0.x/docs/Framework.html#nctouchpointresourcenmos
-    DEFINE_STRING_ENUM(ncp_nmos_resource_type)
-    namespace ncp_nmos_resource_types
+    DEFINE_STRING_ENUM(ncp_touchpoint_resource_type)
+    namespace ncp_touchpoint_resource_types
     {
-        const ncp_nmos_resource_type node{ U("node") };
-        const ncp_nmos_resource_type device{ U("device") };
-        const ncp_nmos_resource_type source{ U("source") };
-        const ncp_nmos_resource_type flow{ U("flow") };
-        const ncp_nmos_resource_type sender{ U("sender") };
-        const ncp_nmos_resource_type receiver{ U("receiver") };
+        const ncp_touchpoint_resource_type node{ U("node") };
+        const ncp_touchpoint_resource_type device{ U("device") };
+        const ncp_touchpoint_resource_type source{ U("source") };
+        const ncp_touchpoint_resource_type flow{ U("flow") };
+        const ncp_touchpoint_resource_type sender{ U("sender") };
+        const ncp_touchpoint_resource_type receiver{ U("receiver") };
     }
 }
 

Development/nmos/control_protocol_typedefs.h

@@ -385,7 +385,7 @@ namespace nmos
             , id(id)
         {}
 
-        nc_touchpoint_resource_nmos(const ncp_nmos_resource_type& resource_type, nc_uuid id)
+        nc_touchpoint_resource_nmos(const ncp_touchpoint_resource_type& resource_type, nc_uuid id)
             : nc_touchpoint_resource(resource_type.name)
             , id(id)
         {}

Development/nmos/control_protocol_utils.cpp

@@ -624,7 +624,7 @@ namespace nmos
                 {
                     auto& resource = nmos::fields::nc::resource(touchpoint);
                     return (resource_id == nmos::fields::nc::id(resource).as_string()
-                        && nmos::ncp_nmos_resource_types::receiver.name == nmos::fields::nc::resource_type(resource));
+                        && nmos::ncp_touchpoint_resource_types::receiver.name == nmos::fields::nc::resource_type(resource));
                 });
                 return (tps.end() != found_tp);
             }