colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

linking: improve link failure & debug messages

Browse Source
This commit is contained in:
George Kiagiadakis
2024-03-25 09:55:13 +02:00
parent 7612068675
commit c89316e52c
2 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
modules/module-si-standard-link.c
View File

@@ -389,7 +389,7 @@ get_ports_and_create_links (WpSiStandardLink *self, WpTransition *transition)
!wp_object_test_active_features (WP_OBJECT (si_in), WP_SESSION_ITEM_FEATURE_ACTIVE)) {
wp_transition_return_error (transition,
g_error_new (WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
"si-standard-link: in/out items are not valid anymore"));
"some node was destroyed before the link was created"));
return;
}
@@ -496,7 +496,7 @@ on_main_adapter_ready (GObject *obj, GAsyncResult * res, gpointer p)
!wp_object_test_active_features (WP_OBJECT (other->si), WP_SESSION_ITEM_FEATURE_ACTIVE)) {
wp_transition_return_error (transition,
g_error_new (WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
"si-standard-link: in/out items are not valid anymore"));
"some node was destroyed before the link was created"));
return;
}
@@ -530,7 +530,7 @@ configure_and_link_adapters (WpSiStandardLink *self, WpTransition *transition)
!wp_object_test_active_features (WP_OBJECT (si_in), WP_SESSION_ITEM_FEATURE_ACTIVE)) {
wp_transition_return_error (transition,
g_error_new (WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
"si-standard-link: in/out items are not valid anymore"));
"some node was destroyed before the link was created"));
return;
}
@@ -627,7 +627,7 @@ si_standard_link_do_link (WpSiStandardLink *self, WpTransition *transition)
!wp_object_test_active_features ((WP_OBJECT (si_in)), WP_SESSION_ITEM_FEATURE_ACTIVE)) {
wp_transition_return_error (transition,
g_error_new (WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
"si-standard-link: in/out items are not valid anymore"));
"some node was destroyed before the link was created"));
return;
}
@@ -681,7 +681,7 @@ si_standard_link_enable_active (WpSessionItem *si, WpTransition *transition)
!wp_object_test_active_features ((WP_OBJECT (si_in)), WP_SESSION_ITEM_FEATURE_ACTIVE)) {
wp_transition_return_error (transition,
g_error_new (WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
"si-standard-link: in/out items are not valid anymore"));
"some node was destroyed before the link was created"));
return;
}

12
src/scripts/linking/link-target.lua
View File

@@ -138,16 +138,16 @@ AsyncEventHook {
end
si_link:register ()
log:info (si_link, "registered virtual si-standard-link between "
.. tostring (si).." and ".. tostring(target))
log:debug (si_link, "registered link between "
.. tostring (si) .. " and " .. tostring (target))
-- only activate non virtual links because virtual links activation is
-- handled by rescan-virtual-links.lua
if not is_virtual_client_link then
si_link:activate (Feature.SessionItem.ACTIVE, function (l, e)
if e then
transition:return_error ("failed to activate si-standard-link: "
.. tostring (si) .. " error:" .. tostring (e))
transition:return_error (tostring (l) .. " link failed: "
.. tostring (e))
if si_flags ~= nil then
si_flags.peer_id = nil
end
@@ -159,8 +159,8 @@ AsyncEventHook {
end
si_flags.failed_count = 0
log:info (l, "activated si-standard-link between "
.. tostring (si).." and ".. tostring(target))
log:debug (l, "activated link between "
.. tostring (si) .. " and " .. tostring (target))
transition:advance ()
end