summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Taymans <wtaymans@redhat.com>2020-09-09 13:57:33 +0200
committerWim Taymans <wtaymans@redhat.com>2020-09-09 13:57:33 +0200
commit5f38562d38e72fa76f8dfe7e1bd1ead853f82ce8 (patch)
tree7dce3f1282bfdd541a6a48aee31fc122112fffc3
parentc8700b2e4bcdebf2af857bde3cb3cb0d944184d9 (diff)
acp: remove active_port_index
It is not clear if the port index is in the card or device port array and it doesn't work when many ports are active. So simply iterate the device ports and find the ones with the active flag set.
-rw-r--r--spa/plugins/alsa/acp/acp.c1
-rw-r--r--spa/plugins/alsa/acp/acp.h1
2 files changed, 0 insertions, 2 deletions
diff --git a/spa/plugins/alsa/acp/acp.c b/spa/plugins/alsa/acp/acp.c
index 41867975..b9332443 100644
--- a/spa/plugins/alsa/acp/acp.c
+++ b/spa/plugins/alsa/acp/acp.c
@@ -960,7 +960,6 @@ static int device_disable(pa_card *impl, pa_alsa_mapping *mapping, pa_alsa_devic
if (dev->active_port) {
dev->active_port->port.flags &= ~ACP_PORT_ACTIVE;
dev->active_port = NULL;
- dev->device.active_port_index = ACP_INVALID_INDEX;
}
return 0;
}
diff --git a/spa/plugins/alsa/acp/acp.h b/spa/plugins/alsa/acp/acp.h
index ecd48e75..65fa13c8 100644
--- a/spa/plugins/alsa/acp/acp.h
+++ b/spa/plugins/alsa/acp/acp.h
@@ -204,7 +204,6 @@ struct acp_device {
float volume_step;
uint32_t n_ports;
- uint32_t active_port_index;
struct acp_port **ports;
};