diff options
| author | Amaury Pouly <amaury.pouly@gmail.com> | 2017-01-14 01:40:12 +0100 |
|---|---|---|
| committer | Amaury Pouly <amaury.pouly@gmail.com> | 2017-02-04 17:22:08 +0100 |
| commit | 1245c5fe61f6ca8e1980a33a8b8f7ea4322829fd (patch) | |
| tree | 117ae10a7d6489070321dc2d5d790daa71f7921b /apps/recorder/recording.c | |
| parent | d052f13999a53e440975e0192c67c8a42c75e4ea (diff) | |
Implement speaker enable/disable on jack (un)plug
The implementation is not very complicated but there are a few things worth
noting. There was a previous "speaker enable" setting but it was a boolean.
I decided to replace it with a choice setting that has 2 options (on, off)
if headphones cannot be detect on this target, or 3 options (on, off, auto)
if we can detect headphones. This will break the old setting on target that
cannot detect jack but it makes the code more uniform and avoid maintaining
two settings with more #ifdef. The third option (auto) uses the LANG_AUTO
text, which I think is clear enough (disable speaker on jack plug).
In order to avoid code duplication (both in apps and firmware), I decided to
keep the audiohw_enable_speaker function as-is: it takes a boolean and doesn't
care about the speaker policy. I introduced a new audio_enable_speaker that
takes directly the mode (which follows the setting encoding): 0=off, 1=on
and 2=auto. This way one calls audio_enable_speaker and it changes the speaker
once to reflect the request mode. The apps code then uses this function in the
places where it makes sense: on setting load, setting change and jack (un)plug
event.
Change-Id: I027873f698eb4bc365d7c02b515297806355d9e2
Diffstat (limited to 'apps/recorder/recording.c')
| -rw-r--r-- | apps/recorder/recording.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index 1c53c8026f..4816b3bad4 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c @@ -1097,7 +1097,7 @@ bool recording_screen(bool no_source) #ifdef HAVE_SPEAKER /* Disable speaker to prevent feedback */ - audiohw_enable_speaker(false); + audio_enable_speaker(0); #endif audio_init_recording(); @@ -1959,7 +1959,7 @@ rec_abort: #ifdef HAVE_SPEAKER /* Re-enable speaker */ - audiohw_enable_speaker(global_settings.speaker_enabled); + audio_enable_speaker(global_settings.speaker_mode); #endif /* make sure the trigger is really turned off */ |