fdo-mirrors/wireplumber
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/wireplumber.git synced 2026-04-28 12:30:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

daemon: check for media-session before loading any components

Browse source 
We shouldn't start doing anything if another session manager is running,
it will just break the other session manager's state.
This commit is contained in:
George Kiagiadakis 2023-04-10 23:36:16 +03:00 • committed by Julian Bouzas
parent 51d5beb36c
commit 13f9f98bc8
1 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
src/main.c
View file

@ -91,9 +91,9 @@ struct _WpInitTransition
enum {
STEP_CONNECT = WP_TRANSITION_STEP_CUSTOM_START,
STEP_CHECK_MEDIA_SESSION,
STEP_PARSE_COMPONENTS,
STEP_LOAD_ENABLE_COMPONENTS,
STEP_CHECK_MEDIA_SESSION,
STEP_CLEANUP,
};
@ -111,10 +111,10 @@ wp_init_transition_get_next_step (WpTransition * transition, guint step)
{
switch (step) {
case WP_TRANSITION_STEP_NONE: return STEP_CONNECT;
case STEP_CONNECT: return STEP_PARSE_COMPONENTS;
case STEP_CONNECT: return STEP_CHECK_MEDIA_SESSION;
case STEP_CHECK_MEDIA_SESSION: return STEP_PARSE_COMPONENTS;
case STEP_PARSE_COMPONENTS: return STEP_LOAD_ENABLE_COMPONENTS;
case STEP_LOAD_ENABLE_COMPONENTS: return STEP_CHECK_MEDIA_SESSION;
case STEP_CHECK_MEDIA_SESSION: return STEP_CLEANUP;
case STEP_LOAD_ENABLE_COMPONENTS: return STEP_CLEANUP;
case STEP_CLEANUP: return WP_TRANSITION_STEP_NONE;
default:
@ -377,6 +377,19 @@ wp_init_transition_execute_step (WpTransition * transition, guint step)
break;
}
case STEP_CHECK_MEDIA_SESSION: {
wp_info_object (self, "Checking for session manager conflicts...");
self->om = wp_object_manager_new ();
wp_object_manager_add_interest (self->om, WP_TYPE_CLIENT,
WP_CONSTRAINT_TYPE_PW_GLOBAL_PROPERTY,
"application.name", "=s", "pipewire-media-session", NULL);
g_signal_connect_object (self->om, "installed",
G_CALLBACK (check_media_session), self, 0);
wp_core_install_object_manager (core, self->om);
break;
}
case STEP_PARSE_COMPONENTS: {
g_autoptr (WpConf) conf = wp_conf_get_instance (core);
g_autoptr (WpSpaJson) json_comps = NULL;
@ -398,19 +411,6 @@ wp_init_transition_execute_step (WpTransition * transition, guint step)
wp_transition_advance (WP_TRANSITION (self));
break;
case STEP_CHECK_MEDIA_SESSION: {
wp_info_object (self, "Checking for session manager conflicts...");
self->om = wp_object_manager_new ();
wp_object_manager_add_interest (self->om, WP_TYPE_CLIENT,
WP_CONSTRAINT_TYPE_PW_GLOBAL_PROPERTY,
"application.name", "=s", "pipewire-media-session", NULL);
g_signal_connect_object (self->om, "installed",
G_CALLBACK (check_media_session), self, 0);
wp_core_install_object_manager (core, self->om);
break;
}
case STEP_CLEANUP:
wp_info ("wirePlumber initialized");
g_clear_object (&self->om);