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

Merge pull request #96 from jusa/jb47194

Browse source 
Improve audio mode changes.
This commit is contained in:
Juho Hämäläinen 2019-12-10 10:47:19 +02:00 • committed by GitHub
commit dcb0b67f67
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -89,9 +89,6 @@ struct droid_quirk valid_quirks[] = {
#define DEFAULT_AUDIO_FORMAT (AUDIO_FORMAT_PCM_16_BIT)
static const char * const droid_combined_auto_outputs[3] = { "primary", "low_latency", NULL };
static const char * const droid_combined_auto_inputs[2] = { "primary", NULL };
static void droid_port_free(pa_droid_port *p);
static int input_stream_set_route(pa_droid_hw_module *hw_module, pa_droid_stream *s);
@ -2064,6 +2061,16 @@ bool pa_droid_hw_set_mode(pa_droid_hw_module *hw_module, audio_mode_t mode) {
ret = false;
pa_log_warn("Failed to set mode.");
} else {
if (hw_module->state.mode != mode && mode == AUDIO_MODE_IN_CALL) {
pa_droid_stream *primary_output;
/* Always start call mode with earpiece. This helps some devices which cannot
* start call directly with headset and doesn't cause any harm with devices
* which can either. */
if ((primary_output = pa_droid_hw_primary_output_stream(hw_module)))
pa_droid_stream_set_route(primary_output, AUDIO_DEVICE_OUT_EARPIECE);
}
hw_module->state.mode = mode;
}
pa_droid_hw_module_unlock(hw_module);

4
src/droid/module-droid-card.c
View file

@ -543,7 +543,7 @@ static pa_card_profile *leave_virtual_profile(struct userdata *u, pa_card *c,
pa_log_debug("Leave virtual profile %s", current->droid_profile->name);
if (next->mode != current->mode) {
park_profile(current->droid_profile);
park_profile(card_get_droid_profile(u->real_profile));
pa_droid_hw_set_mode(u->hw_module, next->mode);
}
@ -596,7 +596,7 @@ static void enter_virtual_profile(struct userdata *u, pa_card *c,
}
if (next->mode != current->mode) {
park_profile(current->droid_profile);
park_profile(card_get_droid_profile(u->real_profile));
pa_droid_hw_set_mode(u->hw_module, next->mode);
}