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

Merge pull request #109 from jusa/jb55711

Browse source 
Use more generic stream property for audio source.
This commit is contained in:
Juho Hämäläinen 2021-10-08 15:42:31 +03:00 • committed by GitHub
commit 0d739ca587
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1771,7 +1771,7 @@ bool pa_droid_stream_reconfigure_input(pa_droid_stream *s,
if (proplist) {
const char *source;
/* If audio source is defined in source-output proplist use that instead. */
if ((source = pa_proplist_gets(proplist, PROP_DROID_INPUT_AUDIO_SOURCE)))
if ((source = pa_proplist_gets(proplist, EXT_PROP_AUDIO_SOURCE)))
pa_string_convert_str_to_num(CONV_STRING_AUDIO_SOURCE_FANCY, source, &audio_source);
}
@ -1817,12 +1817,12 @@ bool pa_droid_stream_reconfigure_input_needed(pa_droid_stream *s,
audio_source_t audio_source;
/* If audio source is defined in source-output proplist use that instead. */
if ((source = pa_proplist_gets(proplist, PROP_DROID_INPUT_AUDIO_SOURCE))) {
if ((source = pa_proplist_gets(proplist, EXT_PROP_AUDIO_SOURCE))) {
if (pa_string_convert_str_to_num(CONV_STRING_AUDIO_SOURCE_FANCY, source, &audio_source) &&
s->module->state.audio_source != audio_source) {
reconfigure_needed = true;
pa_log_debug("input reconfigure needed: " PROP_DROID_INPUT_AUDIO_SOURCE " changes");
pa_log_debug("input reconfigure needed: " EXT_PROP_AUDIO_SOURCE " changes");
}
} else {
if (pa_input_device_default_audio_source(s->module->state.input_device, &audio_source) &&

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

@ -50,7 +50,8 @@
#define PROP_DROID_OUTPUT_OFFLOAD "droid.output.offload"
#define PROP_DROID_INPUT_BUILTIN "droid.input.builtin"
#define PROP_DROID_INPUT_EXTERNAL "droid.input.external"
#define PROP_DROID_INPUT_AUDIO_SOURCE "droid.input.source"
#define EXT_PROP_AUDIO_SOURCE "audio.source"
#define PA_DROID_PRIMARY_DEVICE "primary"