| 修訂 | 4f74bf0755fe9717a48a4f7452e5cd20d402de76 (tree) |
|---|---|
| 時間 | 2021-05-27 16:08:38 |
| 作者 | Dmitry Osipenko <digetx@gmai...> |
| Commiter | Jaroslav Kysela |
codecs/rt5640: Fix restoring of playback volumes
The playback volumes shall be initialized only during of the first
enable sequence, not during the initialization of speaker/headphones
devices. This fixes sound level restoring by pulseaudio when headphones
are inserted/ejected. Previously sound level was always reset to the
default level on insert/ejection, which is the incorrect behaviour.
The correct behaviour is to restore volume the previous level, i.e.
if sound level was 3% before headphones were ejected, then level should
be restored to 3% when headphones are inserted back.
Signed-off-by: Dmitry Osipenko <digetx@gmail.com>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
ucm2/codecs/rt5640/EnableSeq.conf (diff) ucm2/codecs/rt5640/HeadPhones.conf (diff) ucm2/codecs/rt5640/MonoSpeaker.conf (diff) ucm2/codecs/rt5640/Speaker.conf (diff)| @@ -79,4 +79,7 @@ EnableSequence [ | ||
| 79 | 79 | cset "name='HP R Playback Switch' off" |
| 80 | 80 | cset "name='Speaker L Playback Switch' off" |
| 81 | 81 | cset "name='Speaker R Playback Switch' off" |
| 82 | + | |
| 83 | + cset "name='HP Playback Volume' 29" | |
| 84 | + cset "name='Speaker Playback Volume' 35" | |
| 82 | 85 | ] |
| @@ -18,7 +18,6 @@ SectionDevice."Headphones" { | ||
| 18 | 18 | cset "name='HP Channel Switch' on" |
| 19 | 19 | cset "name='HP L Playback Switch' on" |
| 20 | 20 | cset "name='HP R Playback Switch' on" |
| 21 | - cset "name='HP Playback Volume' 29" | |
| 22 | 21 | |
| 23 | 22 | ] |
| 24 | 23 |
| @@ -26,7 +25,6 @@ SectionDevice."Headphones" { | ||
| 26 | 25 | cset "name='HP Channel Switch' off" |
| 27 | 26 | cset "name='HP L Playback Switch' off" |
| 28 | 27 | cset "name='HP R Playback Switch' off" |
| 29 | - cset "name='HP Playback Volume' 0" | |
| 30 | 28 | ] |
| 31 | 29 | |
| 32 | 30 | Value { |
| @@ -13,7 +13,6 @@ SectionDevice."Speaker" { | ||
| 13 | 13 | cset "name='Speaker Channel Switch' on" |
| 14 | 14 | cset "name='Speaker L Playback Switch' on" |
| 15 | 15 | cset "name='Speaker R Playback Switch' on" |
| 16 | - cset "name='Speaker Playback Volume' 35" | |
| 17 | 16 | |
| 18 | 17 | ] |
| 19 | 18 |
| @@ -21,7 +20,6 @@ SectionDevice."Speaker" { | ||
| 21 | 20 | cset "name='Speaker Channel Switch' off" |
| 22 | 21 | cset "name='Speaker L Playback Switch' off" |
| 23 | 22 | cset "name='Speaker R Playback Switch' off" |
| 24 | - cset "name='Speaker Playback Volume' 0" | |
| 25 | 23 | ] |
| 26 | 24 | |
| 27 | 25 | Value { |
| @@ -13,7 +13,6 @@ SectionDevice."Speaker" { | ||
| 13 | 13 | cset "name='Speaker Channel Switch' on" |
| 14 | 14 | cset "name='Speaker L Playback Switch' on" |
| 15 | 15 | cset "name='Speaker R Playback Switch' on" |
| 16 | - cset "name='Speaker Playback Volume' 35" | |
| 17 | 16 | |
| 18 | 17 | ] |
| 19 | 18 |
| @@ -21,7 +20,6 @@ SectionDevice."Speaker" { | ||
| 21 | 20 | cset "name='Speaker Channel Switch' off" |
| 22 | 21 | cset "name='Speaker L Playback Switch' off" |
| 23 | 22 | cset "name='Speaker R Playback Switch' off" |
| 24 | - cset "name='Speaker Playback Volume' 0" | |
| 25 | 23 | ] |
| 26 | 24 | |
| 27 | 25 | Value { |
Android-x86
Fork