streamcompatibility_behaviour: make namespaces full

sony · Oct 3, 2022 · 308f21e · 308f21e
1 parent e2dd598
commit 308f21e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/Development/nmos/node_server.cpp b/Development/nmos/node_server.cpp
@@ -61,7 +61,7 @@ namespace nmos
             // Configure the Channel Mapping API
             node_server.api_routers[{ {}, nmos::fields::channelmapping_port(node_model.settings) }].mount({}, nmos::make_channelmapping_api(node_model, node_implementation.validate_map, gate));
 
-            // Configure the Flow Compatibility API
+            // Configure the Stream Compatibility API
             node_server.api_routers[{ {}, nmos::fields::streamcompatibility_port(node_model.settings) }].mount({}, nmos::experimental::make_streamcompatibility_api(node_model, node_implementation.base_edid_changed, node_implementation.base_edid_deleted, node_implementation.set_effective_edid, node_implementation.active_constraints_changed, gate));
 
             auto& events_ws_api = node_server.ws_handlers[{ {}, nmos::fields::events_ws_port(node_model.settings) }];

diff --git a/Development/nmos/streamcompatibility_behaviour.cpp b/Development/nmos/streamcompatibility_behaviour.cpp
@@ -72,8 +72,8 @@ namespace nmos
                     const auto session_description = sdp::parse_session_description(utility::us2s(sdp_data));
                     auto sdp_params = nmos::parse_session_description(session_description).first;
 
-                    const auto format_params = details::get_format_parameters(sdp_params);
-                    const auto sdp_found = std::find_if(constraint_sets.begin(), constraint_sets.end(), [&](const web::json::value& constraint_set) { return nmos::details::match_sdp_parameters_constraint_set(details::format_constraints, sdp_params, format_params, constraint_set); });
+                    const auto format_params = nmos::details::get_format_parameters(sdp_params);
+                    const auto sdp_found = std::find_if(constraint_sets.begin(), constraint_sets.end(), [&](const web::json::value& constraint_set) { return nmos::details::match_sdp_parameters_constraint_set(nmos::details::format_constraints, sdp_params, format_params, constraint_set); });
 
                     constrained = constrained && constraint_sets.end() != sdp_found;
                 }
@@ -211,11 +211,11 @@ namespace nmos
                                     merged[nmos::fields::master_enable] = value::boolean(false);
                                     auto activation = nmos::make_activation();
                                     activation[nmos::fields::mode] = value::string(nmos::activation_modes::activate_immediate.name);
-                                    details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
+                                    nmos::details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
                                     connection_resource.data[nmos::fields::endpoint_staged] = merged;
                                 });
 
-                                details::handle_immediate_activation_pending(model, lock, sender_id_type, merged[nmos::fields::activation], gate);
+                                nmos::details::handle_immediate_activation_pending(model, lock, sender_id_type, merged[nmos::fields::activation], gate);
                             }
                         }
                     }
@@ -283,11 +283,11 @@ namespace nmos
                                     merged[nmos::fields::master_enable] = value::boolean(false);
                                     auto activation = nmos::make_activation();
                                     activation[nmos::fields::mode] = value::string(nmos::activation_modes::activate_immediate.name);
-                                    details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
+                                    nmos::details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
                                     connection_resource.data[nmos::fields::endpoint_staged] = merged;
                                 });
 
-                                details::handle_immediate_activation_pending(model, lock, receiver_id_type, merged[nmos::fields::activation], gate);
+                                nmos::details::handle_immediate_activation_pending(model, lock, receiver_id_type, merged[nmos::fields::activation], gate);
                             }
                         }
                     }