mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-17 08:56:42 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

switch-on-port-available: remove unused return values

Browse source
This commit is contained in:
Tanu Kaskinen 2017-12-28 17:14:13 +02:00
parent a7e6d77a07
commit d35cc563c1
1 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/modules/module-switch-on-port-available.c
View file

@ -228,17 +228,17 @@ static struct port_pointers find_port_pointers(pa_device_port *port) {
} }
/* Switches to a port, switching profiles if necessary or preferred */ /* Switches to a port, switching profiles if necessary or preferred */
static bool switch_to_port(pa_device_port *port) { static void switch_to_port(pa_device_port *port) {
struct port_pointers pp = find_port_pointers(port); struct port_pointers pp = find_port_pointers(port);
if (pp.is_port_active) if (pp.is_port_active)
return true; /* Already selected */ return; /* Already selected */
pa_log_debug("Trying to switch to port %s", port->name); pa_log_debug("Trying to switch to port %s", port->name);
if (!pp.is_preferred_profile_active) { if (!pp.is_preferred_profile_active) {
if (try_to_switch_profile(port) < 0) { if (try_to_switch_profile(port) < 0) {
if (!pp.is_possible_profile_active) if (!pp.is_possible_profile_active)
return false; return;
} }
else else
/* Now that profile has changed, our sink and source pointers must be updated */ /* Now that profile has changed, our sink and source pointers must be updated */
@ -249,17 +249,16 @@ static bool switch_to_port(pa_device_port *port) {
pa_source_set_port(pp.source, port->name, false); pa_source_set_port(pp.source, port->name, false);
if (pp.sink) if (pp.sink)
pa_sink_set_port(pp.sink, port->name, false); pa_sink_set_port(pp.sink, port->name, false);
return true;
} }
/* Switches away from a port, switching profiles if necessary or preferred */ /* Switches away from a port, switching profiles if necessary or preferred */
static bool switch_from_port(pa_device_port *port) { static void switch_from_port(pa_device_port *port) {
struct port_pointers pp = find_port_pointers(port); struct port_pointers pp = find_port_pointers(port);
pa_device_port *p, *best_port = NULL; pa_device_port *p, *best_port = NULL;
void *state; void *state;
if (!pp.is_port_active) if (!pp.is_port_active)
return true; /* Already deselected */ return; /* Already deselected */
/* Try to find a good enough port to switch to */ /* Try to find a good enough port to switch to */
PA_HASHMAP_FOREACH(p, port->card->ports, state) PA_HASHMAP_FOREACH(p, port->card->ports, state)
@ -270,9 +269,7 @@ static bool switch_from_port(pa_device_port *port) {
pa_log_debug("Trying to switch away from port %s, found %s", port->name, best_port ? best_port->name : "no better option"); pa_log_debug("Trying to switch away from port %s, found %s", port->name, best_port ? best_port->name : "no better option");
if (best_port) if (best_port)
return switch_to_port(best_port); switch_to_port(best_port);
return false;
} }