media-session: add option to enable acp device

This commit is contained in:
Wim Taymans 2020-07-06 12:51:38 +02:00
parent 1612f5e4d2
commit 0bbc25e3e2
2 changed files with 36 additions and 13 deletions

View file

@ -115,6 +115,8 @@ struct impl {
struct spa_source *jack_timeout;
struct pw_proxy *jack_device;
unsigned int use_acp:1;
};
#undef NAME
@ -455,9 +457,13 @@ static int update_device_props(struct device *device)
static void set_profile(struct device *device, int index)
{
struct impl *impl = device->impl;
char buf[1024];
struct spa_pod_builder b = SPA_POD_BUILDER_INIT(buf, sizeof(buf));
if (impl->use_acp)
return;
pw_log_debug("%p: set profile %d id:%d", device, index, device->device_id);
if (device->device_id != 0) {
@ -670,7 +676,7 @@ static struct device *alsa_create_device(struct impl *impl, uint32_t id,
struct spa_handle *handle;
int res;
void *iface;
const char *card;
const char *card, *factory_name;
pw_log_debug("new device %u", id);
@ -679,9 +685,13 @@ static struct device *alsa_create_device(struct impl *impl, uint32_t id,
return NULL;
}
if (impl->use_acp)
factory_name = SPA_NAME_API_ALSA_ACP_DEVICE;
else
factory_name = info->factory_name;
handle = pw_context_load_spa_handle(context,
info->factory_name,
info->props);
factory_name, info->props);
if (handle == NULL) {
res = -errno;
pw_log_error("can't make factory instance: %m");
@ -834,6 +844,7 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
struct pw_context *context = session->context;
struct impl *impl;
void *iface;
const char *str;
int res;
impl = calloc(1, sizeof(struct impl));
@ -842,6 +853,9 @@ int sm_alsa_monitor_start(struct sm_media_session *session)
impl->session = session;
if ((str = pw_properties_get(session->props, "alsa.use-acp")) != NULL)
impl->use_acp = pw_properties_parse_bool(str);
if (session->dbus_connection)
impl->conn = spa_dbus_connection_get(session->dbus_connection);
if (impl->conn == NULL)