gemian/pulseaudio-modules-droid
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

common: Use device definition when creating output stream.

Browse source
This commit is contained in:
Juho Hämäläinen 2019-11-15 14:09:16 +02:00
parent 8bc33cfb25
commit c7a62db215
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/common/droid-util.c
View file

@ -1170,8 +1170,9 @@ fail:
pa_droid_stream *pa_droid_open_output_stream(pa_droid_hw_module *module,
const pa_sample_spec *spec,
const pa_channel_map *map,
audio_output_flags_t flags,
const char *module_output_name,
audio_devices_t devices) {
const pa_droid_config_device *module_output = NULL;
pa_droid_stream *s = NULL;
pa_droid_output_stream *output = NULL;
pa_droid_stream *primary_stream = NULL;
@ -1184,10 +1185,16 @@ pa_droid_stream *pa_droid_open_output_stream(pa_droid_hw_module *module,
pa_assert(module);
pa_assert(spec);
pa_assert(map);
pa_assert(module_output_name);
sample_spec = *spec;
channel_map = *map;
if (!(module_output = pa_droid_config_find_output(module->enabled_module, module_output_name))) {
pa_log("Could not find output %s from module %s.", module_output_name, module->enabled_module->name);
goto fail;
}
if (!stream_config_fill(devices, &sample_spec, &channel_map, &config_out))
goto fail;
@ -1203,7 +1210,7 @@ pa_droid_stream *pa_droid_open_output_stream(pa_droid_hw_module *module,
ret = module->device->open_output_stream(module->device,
++module->stream_out_id,
devices,
flags,
module_output->flags,
&config_out,
&stream
#if AUDIO_API_VERSION_MAJ >= 3
@ -1219,12 +1226,12 @@ pa_droid_stream *pa_droid_open_output_stream(pa_droid_hw_module *module,
goto fail;
}
s = droid_stream_new(module);
s = droid_stream_new(module, module_output);
s->output = output = droid_output_stream_new();
output->stream = stream;
output->sample_spec = *spec;
output->channel_map = *map;
output->flags = flags;
output->flags = module_output->flags;
output->device = devices;
if ((output->sample_spec.rate = output->stream->common.get_sample_rate(&output->stream->common)) != spec->rate)

2
src/common/include/droid/droid-util.h
View file

@ -289,7 +289,7 @@ int pa_droid_stream_set_parameters(pa_droid_stream *s, const char *parameters);
pa_droid_stream *pa_droid_open_output_stream(pa_droid_hw_module *module,
const pa_sample_spec *spec,
const pa_channel_map *map,
audio_output_flags_t flags,
const char *module_output_name,
audio_devices_t devices);
/* Set routing to the input or output stream, with following side-effects: