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

default-profile: restore saved profile only for first time

Browse source 
Don't always try to restore the saved profile when it's available
but only do this the first time. From then on, try to follow the
best profile when it changes.
This commit is contained in:
Wim Taymans 2021-03-15 13:27:56 +01:00
parent 0b6d3e4b71
commit 85a102f414
1 changed files with 23 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -74,6 +74,7 @@ struct device {
struct spa_hook listener; struct spa_hook listener;
unsigned int restored:1;
uint32_t saved_profile; uint32_t saved_profile;
uint32_t best_profile; uint32_t best_profile;
uint32_t active_profile; uint32_t active_profile;
@ -244,8 +245,6 @@ static int set_profile(struct device *dev, struct profile *pr)
SPA_PARAM_PROFILE_index, SPA_POD_Int(pr->index), SPA_PARAM_PROFILE_index, SPA_POD_Int(pr->index),
SPA_PARAM_PROFILE_save, SPA_POD_Bool(pr->save))); SPA_PARAM_PROFILE_save, SPA_POD_Bool(pr->save)));
dev->active_profile = pr->index;
sm_media_session_schedule_rescan(dev->impl->session); sm_media_session_schedule_rescan(dev->impl->session);
return 0; return 0;
@ -296,34 +295,35 @@ static int handle_profile_switch(struct device *dev)
dev->name, spa_strerror(res)); dev->name, spa_strerror(res));
best.index = SPA_ID_INVALID; best.index = SPA_ID_INVALID;
} else { } else {
if (dev->best_profile != best.index) changed = dev->best_profile != best.index;
changed = true;
dev->best_profile = best.index; dev->best_profile = best.index;
pw_log_info("device '%s': found best profile '%s' changed:%d", pw_log_info("device '%s': found best profile '%s' changed:%d",
dev->name, best.name, changed); dev->name, best.name, changed);
} }
if (!dev->restored) {
/* try to restore our saved profile */ /* try to restore our saved profile */
res = find_saved_profile(dev, &saved); res = find_saved_profile(dev, &saved);
if (res >= 0) { if (res >= 0) {
/* we found a saved profile */ /* we found a saved profile */
if (saved.available == SPA_PARAM_AVAILABILITY_no) { if (saved.available == SPA_PARAM_AVAILABILITY_no) {
pw_log_info("device '%s': saved profile '%s' unavailable", pw_log_info("device '%s': saved profile '%s' unavailable",
dev->name, saved.name); dev->name, saved.name);
if (!changed) } else {
best.index = SPA_ID_INVALID; pw_log_info("device '%s': found saved profile '%s'",
dev->name, saved.name);
/* make sure we save again */
saved.save = true;
best = saved;
changed = true;
}
} else { } else {
pw_log_info("device '%s': found saved profile '%s'", pw_log_info("device '%s': no saved profile: %s",
dev->name, saved.name); dev->name, spa_strerror(res));
/* make sure we save again */
saved.save = true;
best = saved;
} }
} else { dev->restored = true;
pw_log_info("device '%s': no saved profile: %s",
dev->name, spa_strerror(res));
} }
if (best.index != SPA_ID_INVALID) {
if (best.index != SPA_ID_INVALID && changed) {
if (dev->active_profile == best.index) { if (dev->active_profile == best.index) {
pw_log_info("device '%s': best profile '%s' is already active", pw_log_info("device '%s': best profile '%s' is already active",
dev->name, best.name); dev->name, best.name);