Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
W
wireplumber
Manage
Activity
Members
Labels
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
pkg
wireplumber
Commits
403bb064
Commit
403bb064
authored
4 years ago
by
George Kiagiadakis
Browse files
Options
Downloads
Patches
Plain Diff
impl-endpoint{,-stream}: disable FEATURE_PROPS temporarily
parent
1afc4873
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
lib/wp/endpoint-stream.c
+5
-5
5 additions, 5 deletions
lib/wp/endpoint-stream.c
lib/wp/endpoint.c
+5
-5
5 additions, 5 deletions
lib/wp/endpoint.c
with
10 additions
and
10 deletions
lib/wp/endpoint-stream.c
+
5
−
5
View file @
403bb064
...
@@ -450,10 +450,10 @@ wp_impl_endpoint_stream_activate_get_next_step (WpObject * object,
...
@@ -450,10 +450,10 @@ wp_impl_endpoint_stream_activate_get_next_step (WpObject * object,
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
/* if the item has a node, cache its props so that enum_params works */
/* if the item has a node, cache its props so that enum_params works */
if
(
node
&&
!
(
wp_object_get_active_features
(
node
)
&
//
if (node && !(wp_object_get_active_features (node) &
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
))
//
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS))
return
STEP_ACTIVATE_NODE
;
//
return STEP_ACTIVATE_NODE;
else
//
else
return
WP_PIPEWIRE_OBJECT_MIXIN_STEP_BIND
;
return
WP_PIPEWIRE_OBJECT_MIXIN_STEP_BIND
;
}
}
/* cache info if supported */
/* cache info if supported */
...
@@ -490,7 +490,7 @@ wp_impl_endpoint_stream_activate_execute_step (WpObject * object,
...
@@ -490,7 +490,7 @@ wp_impl_endpoint_stream_activate_execute_step (WpObject * object,
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
wp_object_activate
(
node
,
wp_object_activate
(
node
,
WP_PROXY_FEATURE_BOUND
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
,
WP_PROXY_FEATURE_BOUND
/*
| WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
*/
,
NULL
,
(
GAsyncReadyCallback
)
wp_impl_endpoint_stream_node_activated
,
NULL
,
(
GAsyncReadyCallback
)
wp_impl_endpoint_stream_node_activated
,
transition
);
transition
);
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
lib/wp/endpoint.c
+
5
−
5
View file @
403bb064
...
@@ -966,10 +966,10 @@ wp_impl_endpoint_activate_get_next_step (WpObject * object,
...
@@ -966,10 +966,10 @@ wp_impl_endpoint_activate_get_next_step (WpObject * object,
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
/* if the item has a node, cache its props so that enum_params works */
/* if the item has a node, cache its props so that enum_params works */
if
(
node
&&
!
(
wp_object_get_active_features
(
node
)
&
//
if (node && !(wp_object_get_active_features (node) &
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
))
//
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS))
return
STEP_ACTIVATE_NODE
;
//
return STEP_ACTIVATE_NODE;
else
//
else
return
WP_PIPEWIRE_OBJECT_MIXIN_STEP_BIND
;
return
WP_PIPEWIRE_OBJECT_MIXIN_STEP_BIND
;
}
}
/* enable FEATURE_STREAMS when there is nothing else left to activate */
/* enable FEATURE_STREAMS when there is nothing else left to activate */
...
@@ -1008,7 +1008,7 @@ wp_impl_endpoint_activate_execute_step (WpObject * object,
...
@@ -1008,7 +1008,7 @@ wp_impl_endpoint_activate_execute_step (WpObject * object,
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
WP_SESSION_ITEM
(
self
->
item
),
WP_TYPE_NODE
);
wp_object_activate
(
node
,
wp_object_activate
(
node
,
WP_PROXY_FEATURE_BOUND
|
WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
,
WP_PROXY_FEATURE_BOUND
/*
| WP_PIPEWIRE_OBJECT_FEATURE_PARAM_PROPS
*/
,
NULL
,
(
GAsyncReadyCallback
)
wp_impl_endpoint_node_activated
,
NULL
,
(
GAsyncReadyCallback
)
wp_impl_endpoint_node_activated
,
transition
);
transition
);
break
;
break
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment