mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

media-session: always try to activate the saved profile

Browse source 
When the current profile is not the saved profile, check if the
saved profile is available again and try to activate it.
This commit is contained in:
Wim Taymans 2021-01-28 16:56:27 +01:00
parent f03deb5324
commit c0ed88f2f9
1 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

23
src/examples/media-session/default-profile.c
View file

@ -76,6 +76,7 @@ struct device {
unsigned int restored:1; unsigned int restored:1;
uint32_t saved_profile;
uint32_t active_profile; uint32_t active_profile;
}; };
@ -241,6 +242,9 @@ static int set_profile(struct device *dev, struct profile *pr)
char buf[1024]; char buf[1024];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf)); struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
if (dev->active_profile == pr->index)
return 0;
pw_device_set_param((struct pw_device*)dev->obj->obj.proxy, pw_device_set_param((struct pw_device*)dev->obj->obj.proxy,
SPA_PARAM_Profile, 0, SPA_PARAM_Profile, 0,
spa_pod_builder_add_object(&b, spa_pod_builder_add_object(&b,
@ -271,12 +275,18 @@ static int handle_profile(struct device *dev)
pw_log_info("device '%s': active profile '%s' unavailable", pw_log_info("device '%s': active profile '%s' unavailable",
dev->name, pr.name); dev->name, pr.name);
/* ignore hdmi profile removal of unavailable, this can happen
* when the screen is put to sleep */
if (strstr(pr.name, "hdmi") != NULL)
return 0;
dev->restored = false; dev->restored = false;
} else if (dev->saved_profile && pr.index != dev->saved_profile) {
struct profile saved;
/* we had a saved profile but we're on some other profile,
* see if the saved profile is available now and switch to it */
res = find_saved_profile(dev, &saved);
if (res >= 0 && saved.available != SPA_PARAM_AVAILABILITY_no) {
pw_log_info("device '%s': restore saved profile '%s' index %d",
dev->name, saved.name, saved.index);
if (set_profile(dev, &saved) >= 0)
dev->restored = true;
}
} }
} }
if (!dev->restored) { if (!dev->restored) {
@ -302,6 +312,7 @@ static int handle_profile(struct device *dev)
} else { } else {
pw_log_info("device '%s': found saved profile '%s'", pw_log_info("device '%s': found saved profile '%s'",
dev->name, pr.name); dev->name, pr.name);
dev->saved_profile = pr.index;
} }
if (res >= 0) { if (res >= 0) {
pw_log_info("device '%s': restore profile '%s' index %d", pw_log_info("device '%s': restore profile '%s' index %d",
@ -319,6 +330,7 @@ static int handle_profile(struct device *dev)
return 0; return 0;
dev->active_profile = pr.index; dev->active_profile = pr.index;
dev->saved_profile = pr.index;
if (pw_properties_setf(impl->properties, dev->key, "{ \"name\": \"%s\" }", pr.name)) { if (pw_properties_setf(impl->properties, dev->key, "{ \"name\": \"%s\" }", pr.name)) {
pw_log_info("device '%s': active profile changed to '%s'", dev->name, pr.name); pw_log_info("device '%s': active profile changed to '%s'", dev->name, pr.name);
add_idle_timeout(impl); add_idle_timeout(impl);
@ -370,6 +382,7 @@ static void session_create(void *data, struct sm_object *object)
dev->name = strdup(name); dev->name = strdup(name);
dev->key = spa_aprintf(PREFIX"%s", name); dev->key = spa_aprintf(PREFIX"%s", name);
dev->active_profile = SPA_ID_INVALID; dev->active_profile = SPA_ID_INVALID;
dev->saved_profile = SPA_ID_INVALID;
dev->obj->obj.mask |= SM_DEVICE_CHANGE_MASK_PARAMS; dev->obj->obj.mask |= SM_DEVICE_CHANGE_MASK_PARAMS;
sm_object_add_listener(&dev->obj->obj, &dev->listener, &object_events, dev); sm_object_add_listener(&dev->obj->obj, &dev->listener, &object_events, dev);