Skip to content

Revert "Use the PulseAudio port name rather than the sink name (#419)" #505

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
milaq wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Revert "Use the PulseAudio port name rather than the sink name (#419)" #505

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/pulse.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,14 +122,13 @@ static void store_info_from_sink_cb(pa_context *c,
int avg_vol = pa_cvolume_avg(&info->volume);
int vol_perc = roundf((float)avg_vol * 100 / PA_VOLUME_NORM);
int composed_volume = COMPOSE_VOLUME_MUTE(vol_perc, info->mute);
const char *desc = (info->active_port != NULL) ? info->active_port->description : info->description;

/* if this is the default sink we must try to save it twice: once with
* DEFAULT_SINK_INDEX as the index, and another with its proper value
* (using bitwise OR to avoid early-out logic) */
if ((info->index == default_sink_idx &&
save_info(DEFAULT_SINK_INDEX, composed_volume, desc, NULL)) |
save_info(info->index, composed_volume, desc, info->name)) {
save_info(DEFAULT_SINK_INDEX, composed_volume, info->description, NULL)) |
save_info(info->index, composed_volume, info->description, info->name)) {
/* if the volume, mute flag or description changed, wake the main thread */
pthread_kill(main_thread, SIGUSR1);
}
Expand Down