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

core: change configured_default_sink/source type to string

Browse source 
This allows us to restore the default device properly when a
hotpluggable device (e.g. a USB sound card) is set as the default, but
unplugged temporarily. Previously we would forget that the unplugged
device was ever set as the default, because we had to set
configured_default_sink to NULL to avoid having a stale pa_sink pointer,
and also because module-default-device-restore couldn't resolve the name
of a currently-unplugged device to a pa_sink pointer.

BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=89934
This commit is contained in:
Tanu Kaskinen 2017-06-30 00:09:34 +03:00
parent abdd14d5e0
commit a448cc587c
9 changed files with 63 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/modules/dbus/iface-core.c
View file

@ -721,7 +721,7 @@ static void handle_set_fallback_sink(DBusConnection *conn, DBusMessage *msg, DBu
return;
}
pa_core_set_configured_default_sink(c->core, pa_dbusiface_device_get_sink(fallback_sink));
pa_core_set_configured_default_sink(c->core, pa_dbusiface_device_get_sink(fallback_sink)->name);
pa_dbus_send_empty_reply(conn, msg);
}
@ -809,7 +809,7 @@ static void handle_set_fallback_source(DBusConnection *conn, DBusMessage *msg, D
return;
}
pa_core_set_configured_default_source(c->core, pa_dbusiface_device_get_source(fallback_source));
pa_core_set_configured_default_source(c->core, pa_dbusiface_device_get_source(fallback_source)->name);
pa_dbus_send_empty_reply(conn, msg);
}

30
src/modules/module-default-device-restore.c
View file

@ -60,7 +60,6 @@ static void load(struct userdata *u) {
pa_log_info("Manually configured default sink, not overwriting.");
else if ((f = pa_fopen_cloexec(u->sink_filename, "r"))) {
char ln[256] = "";
pa_sink *s;
if (fgets(ln, sizeof(ln)-1, f))
pa_strip_nl(ln);
@ -68,11 +67,12 @@ static void load(struct userdata *u) {
if (!ln[0])
pa_log_info("No previous default sink setting, ignoring.");
else if ((s = pa_namereg_get(u->core, ln, PA_NAMEREG_SINK))) {
pa_core_set_configured_default_sink(u->core, s);
pa_log_info("Restored default sink '%s'.", ln);
} else
pa_log_info("Saved default sink '%s' not existent, not restoring default sink setting.", ln);
else if (!pa_namereg_is_valid_name(ln))
pa_log_warn("Invalid sink name: %s", ln);
else {
pa_log_info("Restoring default sink '%s'.", ln);
pa_core_set_configured_default_sink(u->core, ln);
}
} else if (errno != ENOENT)
pa_log("Failed to load default sink: %s", pa_cstrerror(errno));
@ -81,7 +81,6 @@ static void load(struct userdata *u) {
pa_log_info("Manually configured default source, not overwriting.");
else if ((f = pa_fopen_cloexec(u->source_filename, "r"))) {
char ln[256] = "";
pa_source *s;
if (fgets(ln, sizeof(ln)-1, f))
pa_strip_nl(ln);
@ -89,14 +88,15 @@ static void load(struct userdata *u) {
if (!ln[0])
pa_log_info("No previous default source setting, ignoring.");
else if ((s = pa_namereg_get(u->core, ln, PA_NAMEREG_SOURCE))) {
pa_core_set_configured_default_source(u->core, s);
pa_log_info("Restored default source '%s'.", ln);
} else
pa_log_info("Saved default source '%s' not existent, not restoring default source setting.", ln);
else if (!pa_namereg_is_valid_name(ln))
pa_log_warn("Invalid source name: %s", ln);
else {
pa_log_info("Restoring default source '%s'.", ln);
pa_core_set_configured_default_source(u->core, ln);
}
} else if (errno != ENOENT)
pa_log("Failed to load default sink: %s", pa_cstrerror(errno));
pa_log("Failed to load default source: %s", pa_cstrerror(errno));
}
static void save(struct userdata *u) {
@ -107,7 +107,7 @@ static void save(struct userdata *u) {
if (u->sink_filename) {
if ((f = pa_fopen_cloexec(u->sink_filename, "w"))) {
fprintf(f, "%s\n", u->core->default_sink ? u->core->default_sink->name : "");
fprintf(f, "%s\n", u->core->configured_default_sink ? u->core->configured_default_sink : "");
fclose(f);
} else
pa_log("Failed to save default sink: %s", pa_cstrerror(errno));
@ -115,7 +115,7 @@ static void save(struct userdata *u) {
if (u->source_filename) {
if ((f = pa_fopen_cloexec(u->source_filename, "w"))) {
fprintf(f, "%s\n", u->core->default_source ? u->core->default_source->name : "");
fprintf(f, "%s\n", u->core->configured_default_source ? u->core->configured_default_source : "");
fclose(f);
} else
pa_log("Failed to save default source: %s", pa_cstrerror(errno));

8
src/modules/module-switch-on-connect.c
View file

@ -77,7 +77,7 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
/* No default sink, nothing to move away, just set the new default */
if (!c->default_sink) {
pa_core_set_configured_default_sink(c, sink);
pa_core_set_configured_default_sink(c, sink->name);
return PA_HOOK_OK;
}
@ -91,7 +91,7 @@ static pa_hook_result_t sink_put_hook_callback(pa_core *c, pa_sink *sink, void*
old_default_sink = c->default_sink;
/* Actually do the switch to the new sink */
pa_core_set_configured_default_sink(c, sink);
pa_core_set_configured_default_sink(c, sink->name);
/* Now move all old inputs over */
if (pa_idxset_size(old_default_sink->inputs) <= 0) {
@ -143,7 +143,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
/* No default source, nothing to move away, just set the new default */
if (!c->default_source) {
pa_core_set_configured_default_source(c, source);
pa_core_set_configured_default_source(c, source->name);
return PA_HOOK_OK;
}
@ -157,7 +157,7 @@ static pa_hook_result_t source_put_hook_callback(pa_core *c, pa_source *source,
old_default_source = c->default_source;
/* Actually do the switch to the new source */
pa_core_set_configured_default_source(c, source);
pa_core_set_configured_default_source(c, source->name);
/* Now move all old outputs over */
if (pa_idxset_size(old_default_source->outputs) <= 0) {