From ccf639f8562ef0cb6f7906b03539be9a2d9df166 Mon Sep 17 00:00:00 2001 From: Dylan Van Assche Date: Sun, 23 May 2021 16:20:30 +0200 Subject: [PATCH] device-pine64-pinephone: detect headphones jack events (MR 2190) Headset jack events emit 2 events: 'Headset Microphone Jack' and 'Headphone Jack'. These were properly detected before, but not headphone jack events only: 'Headphone Jack'. This change allows to detect headphone jack events as well and act on these events by setting the headphones as default audio output while keeping the internal microphone as audio input. For headsets, the microphone is switched to the headset microphone as well. --- device/main/device-pine64-pinephone/APKBUILD | 4 ++-- device/main/device-pine64-pinephone/ucm/HiFi.conf | 2 +- device/main/device-pine64-pinephone/ucm/VoiceCall.conf | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/device/main/device-pine64-pinephone/APKBUILD b/device/main/device-pine64-pinephone/APKBUILD index 216e1f7e6..01cb2f522 100644 --- a/device/main/device-pine64-pinephone/APKBUILD +++ b/device/main/device-pine64-pinephone/APKBUILD @@ -197,9 +197,9 @@ cf7d4a611701745762f19746e40d87b6df14a6b24f2d466c4177b7ab5ee87a048bab719a6c667221 8adeca98002ff8ee850512f72f2e126348cfa817a1aefdd77d103aee76a6b2e6a024deffcbeef1235ee2fcc766003f55b67cedb3eb06ca92a58d5b81f2bf6848 eg25-pinephone-1.2.toml f4b5509fd6a8b23f3667f5e7262b3a19c607a37cb9eaf7d0e93eb826d45c26ec12df4810879bacb8e4042bb83cc80b2b436224c8d47b6d67361369a724bbf7ee sysrq.conf 9d4bcc02c6c501b3a205516c8f276ef4293d88edea61ac725887ec28f9f6788320e9f9edd7f1cf29bbf6122acfad2ef5b3ad5e4b33763fe867bd23d2ac17ed5c uboot-script.cmd -aef9f00f1d327b11640c4dbcb7b6ad5b0bac3118e262af5d7d6a37d87757559856438c0adea834f03752725876c3f857ed903cdfaaf678459bbcd7633d523ded HiFi.conf +f963898fa2ce66bc830e56feeec6ffc9888834e14cc1591d72908ef45ad82532bc3ef5fb32413e07b6722749c9d03e7cf92f06f1fcb859c38b9297cf58e5cedd HiFi.conf e852b48a687f9b2a0eca444aa3d00a1818aead9f5e5d28e070b51c9d6f8ec648e66f1d88e2bfa94d74533f9ffb9aacc1703da2a06693f85fa04ff97fd7528012 PinePhone.conf -6e226e8dc39a438629f443a33e1ba7ea5f7f1a08b98ec58b2bf97036e549d3ce9898de708020a632f4fd2f9d6540a621331e4d2c406c1e729d073113aff55ec3 VoiceCall.conf +e093f71c37370927468de35a987150a3db3e1cc1c76c144bf58918a09c688c3da84303b5533241e691a6aa0758589e2a6498b1097974117782e909f0bbc6bf71 VoiceCall.conf ed0e03f7e1c0348c06be9a7922414469245604ce813bbf0c8910ef211cb993bbb0d0d4615c9c961d50712415f85d6b73e0cf02780ac784666aac56e4889341e4 UPower.conf 9c472065b19141dd4c7555869b955de2e679b36e597f9fa3bdac18d0e9460986b0e2fffe1e04751301305f1b6474c1375803afb7d6212eeae91b4905d0bf8ff8 pulse-pinephone.conf " diff --git a/device/main/device-pine64-pinephone/ucm/HiFi.conf b/device/main/device-pine64-pinephone/ucm/HiFi.conf index 31c460ad5..99500d294 100644 --- a/device/main/device-pine64-pinephone/ucm/HiFi.conf +++ b/device/main/device-pine64-pinephone/ucm/HiFi.conf @@ -137,6 +137,6 @@ SectionDevice."Headphones" { PlaybackChannels 2 PlaybackPriority 500 PlaybackPCM "hw:${CardId},0" - JackControl "Headset Microphone Jack" + JackControl "Headphone Jack" } } diff --git a/device/main/device-pine64-pinephone/ucm/VoiceCall.conf b/device/main/device-pine64-pinephone/ucm/VoiceCall.conf index 7cfa57b14..81d3583db 100644 --- a/device/main/device-pine64-pinephone/ucm/VoiceCall.conf +++ b/device/main/device-pine64-pinephone/ucm/VoiceCall.conf @@ -142,6 +142,6 @@ SectionDevice."Headphones" { PlaybackChannels 2 PlaybackPriority 500 PlaybackPCM "hw:${CardId},0" - JackControl "Headset Microphone Jack" + JackControl "Headphone Jack" } }