Store the registry as a struct pw_registry instead of a pw_proxy #1625
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
swick
reviewed
Feb 12, 2025
src/pipewire.c
Outdated
| @@ -224,7 +229,7 @@ pipewire_remote_destroy (PipeWireRemote *remote) | |||
| /* This check is a workaround for older PW versions */ | |||
| if (remote->registry) | |||
| spa_hook_remove (&remote->registry_listener); | |||
| g_clear_pointer (&remote->registry, pw_proxy_destroy); | |||
| g_clear_pointer (&remote->registry, pipewire_registry_destroy); | |||
There was a problem hiding this comment.
Suggested change
| g_clear_pointer (&remote->registry, pipewire_registry_destroy); | |
| g_clear_pointer ((struct pw_proxy **)&remote->registry, pw_proxy_destroy); |
There was a problem hiding this comment.
ouch, I would have said I tried that and it didn't build, before adding the helper function. Thanks for suggesting that change. I made that change and I guess you can squash all commits before merging, right? or do you want me to merge them into one and force push?
There was a problem hiding this comment.
Cleaning the history and force pushing would be appreciated.
There was a problem hiding this comment.
For the future: we also try to prefix the commit message with the area the code touches. In this case pipewire: ....
There was a problem hiding this comment.
I wasn't aware of that. Noted.
This is a better fix for flatpak#1611 and an improvement over flatpak#1624 as requested by @swick.
antlarr-suse
force-pushed
the
fix-build-pipewire-1.3.82-take2
branch
from
ec29ea9 to
ad138bc
Compare
|
Thanks, this LGTM. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This is a better fix for #1611 and an improvement over #1624 as requested by @swick.