IS-11 branch: v1.0-dev -> v1.0.x

Co-authored-by: Simon Lo <[email protected]>
sony · Mar 15, 2024 · 7bce8b5 · 7bce8b5
1 parent 3fa4720
commit 7bce8b5
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 13 deletions.
diff --git a/Development/nmos/streamcompatibility_api.h b/Development/nmos/streamcompatibility_api.h
@@ -7,7 +7,7 @@
 #include "nmos/slog.h"
 
 // Stream Compatibility Management API implementation
-// See https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/StreamCompatibilityManagementAPI.html
+// See https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/StreamCompatibilityManagementAPI.html
 namespace nmos
 {
     struct node_model;

diff --git a/Development/nmos/streamcompatibility_resources.h b/Development/nmos/streamcompatibility_resources.h
@@ -24,13 +24,13 @@ namespace nmos
         web::json::value make_streamcompatibility_edid_endpoint(const web::uri& edid_file, bool locked = false);
         web::json::value make_streamcompatibility_edid_endpoint(const utility::string_t& edid_file, bool locked = false);
 
-        // See https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/input.html
+        // See https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/input.html
         // Makes an input without EDID support
         nmos::resource make_streamcompatibility_input(const nmos::id& id, const nmos::id& device_id, bool connected, const std::vector<nmos::id>& senders, const nmos::settings& settings);
         // Makes an input with EDID support
         nmos::resource make_streamcompatibility_input(const nmos::id& id, const nmos::id& device_id, bool connected, bool base_edid_support, const boost::variant<utility::string_t, web::uri>& effective_edid, const std::vector<nmos::id>& senders, const nmos::settings& settings);
 
-        // See https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/output.html
+        // See https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/output.html
         // Makes an output without EDID support
         nmos::resource make_streamcompatibility_output(const nmos::id& id, const nmos::id& device_id, bool connected, const std::vector<nmos::id>& receivers, const nmos::settings& settings);
         // Makes an output with EDID support

diff --git a/Development/nmos/streamcompatibility_state.h b/Development/nmos/streamcompatibility_state.h
@@ -6,8 +6,8 @@
 namespace nmos
 {
     // Stream Compatibility Input states
-    // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#status-of-input
-    // and https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/input.html
+    // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#status-of-input
+    // and https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/input.html
     DEFINE_STRING_ENUM(input_state)
     namespace input_states
     {
@@ -17,8 +17,8 @@ namespace nmos
     }
 
     // Stream Compatibility Output states
-    // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#status-of-output
-    // and https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/output.html
+    // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#status-of-output
+    // and https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/output.html
     DEFINE_STRING_ENUM(output_state)
     namespace output_states
     {
@@ -28,8 +28,8 @@ namespace nmos
     }
 
     // Stream Compatibility Sender states
-    // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#status-of-sender
-    // and https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/sender-status.html
+    // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#status-of-sender
+    // and https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/sender-status.html
     DEFINE_STRING_ENUM(sender_state)
     namespace sender_states
     {
@@ -41,8 +41,8 @@ namespace nmos
     }
 
     // Stream Compatibility Receiver states
-    // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#status-of-receiver
-    // and https://specs.amwa.tv/is-11/branches/v1.0-dev/APIs/schemas/with-refs/receiver-status.html
+    // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#status-of-receiver
+    // and https://specs.amwa.tv/is-11/branches/v1.0.x/APIs/schemas/with-refs/receiver-status.html
     DEFINE_STRING_ENUM(receiver_state)
     namespace receiver_states
     {

diff --git a/Development/nmos/streamcompatibility_validation.cpp b/Development/nmos/streamcompatibility_validation.cpp
@@ -53,7 +53,7 @@ namespace nmos
         // An inactive Sender in this state MUST NOT allow activations.
         // At any time if State of an active Receiver becomes non_compliant_stream, the Receiver SHOULD become inactive.
         // An inactive Receiver in this state SHOULD NOT allow activations."
-        // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#preventing-restrictions-violation
+        // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#preventing-restrictions-violation
         nmos::details::connection_resource_patch_validator make_connection_streamcompatibility_validator(nmos::node_model& model)
         {
             return [&model] (const nmos::resource& resource, const nmos::resource& connection_resource, const web::json::value& endpoint_staged, slog::base_gate& gate)

diff --git a/Development/nmos/streamcompatibility_validation.h b/Development/nmos/streamcompatibility_validation.h
@@ -94,7 +94,7 @@ namespace nmos
         // An inactive Sender in this state MUST NOT allow activations.
         // At any time if State of an active Receiver becomes non_compliant_stream, the Receiver SHOULD become inactive.
         // An inactive Receiver in this state SHOULD NOT allow activations."
-        // See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#preventing-restrictions-violation
+        // See https://specs.amwa.tv/is-11/branches/v1.0.x/docs/Behaviour_-_Server_Side.html#preventing-restrictions-violation
         nmos::details::connection_resource_patch_validator make_connection_streamcompatibility_validator(nmos::node_model& model);
 
         details::streamcompatibility_sender_validator make_streamcompatibility_sender_resources_validator(const details::resource_constraints_matcher& resource_matcher, const details::transport_file_constraint_sets_matcher& transport_file_matcher);