Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions Development/cmake/NmosCppTest.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ set(NMOS_CPP_TEST_MDNS_TEST_HEADERS

set(NMOS_CPP_TEST_NMOS_TEST_SOURCES
nmos/test/api_utils_test.cpp
nmos/test/bcp_008_test.cpp
nmos/test/capabilities_test.cpp
nmos/test/channels_test.cpp
nmos/test/condition_variable_test.cpp
Expand Down
3 changes: 3 additions & 0 deletions Development/nmos/control_protocol_handlers.h
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,9 @@ namespace nmos
// construct callback to retrieve a specific method
get_control_protocol_method_descriptor_handler make_get_control_protocol_method_descriptor_handler(experimental::control_protocol_state& control_protocol_state);

// Set monitor status to pending
monitor_status_pending_handler make_monitor_status_pending_handler(experimental::control_protocol_state& control_protocol_state);

// control_protocol_connection_activation_handler notifies that the active parameters for the specified (IS-05) sender/connection_sender or receiver/connection_receiver have changed
control_protocol_connection_activation_handler make_monitor_connection_activation_handler(resources& resources, experimental::control_protocol_state& control_protocol_state, slog::base_gate& gate);

Expand Down
5 changes: 4 additions & 1 deletion Development/nmos/control_protocol_utils.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -444,9 +444,12 @@ namespace nmos
return false;
}

// check whether the the status message changed when the status is unchanged
// check whether the status message changed when the status is unchanged
if (status == current_status.as_integer())
{
// cancel any pending status updates if any
set_property(resources, oid, status_pending_received_time_field_name, web::json::value::number(0), gate);

// has status message changed?
const auto& current_status_message = get_property(resources, oid, status_message_property_id, get_control_protocol_class_descriptor, gate);
if ((current_status_message.is_null() && status_message.size()) || (!current_status_message.is_null() && current_status_message.as_string() != status_message))
Expand Down
Loading
Loading