moby: switch to manjaro alsa UCM files
the "internal speaker" is broken -- not sure if this minor change will fix that or not
This commit is contained in:
parent
eb02b8aa23
commit
5ed7888710
|
@ -73,7 +73,11 @@
|
||||||
hardware.sensor.iio.enable = true;
|
hardware.sensor.iio.enable = true;
|
||||||
|
|
||||||
# from https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/alsa-ucm-pinephone
|
# from https://gitlab.manjaro.org/manjaro-arm/packages/community/phosh/alsa-ucm-pinephone
|
||||||
# mobile-nixos does this same thing
|
# mobile-nixos does this same thing, with *slightly different settings*.
|
||||||
|
# i trust manjaro more because the guy maintaining that is actively trying to upstream into alsa-ucm-conf.
|
||||||
|
# an alternative may be to build a custom alsa with the PinePhone config patch applied:
|
||||||
|
# - <https://github.com/alsa-project/alsa-ucm-conf/pull/134>
|
||||||
|
# that would make this be not device-specific
|
||||||
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
environment.variables.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
systemd.services.pulseaudio.environment.ALSA_CONFIG_UCM2 = "${./ucm2}";
|
||||||
|
|
||||||
|
|
|
@ -21,11 +21,9 @@ SectionVerb {
|
||||||
|
|
||||||
cset "name='Line In Capture Switch' off"
|
cset "name='Line In Capture Switch' off"
|
||||||
cset "name='Mic1 Capture Switch' off"
|
cset "name='Mic1 Capture Switch' off"
|
||||||
cset "name='Mic1 Boost Volume' 0"
|
cset "name='Mic1 Boost Volume' 7"
|
||||||
cset "name='Mic1 Playback Volume' 7"
|
|
||||||
cset "name='Mic2 Capture Switch' off"
|
cset "name='Mic2 Capture Switch' off"
|
||||||
cset "name='Mic2 Boost Volume' 0"
|
cset "name='Mic2 Boost Volume' 7"
|
||||||
cset "name='Mic2 Playback Volume' 7"
|
|
||||||
cset "name='Mixer Capture Switch' off"
|
cset "name='Mixer Capture Switch' off"
|
||||||
cset "name='Mixer Reversed Capture Switch' off"
|
cset "name='Mixer Reversed Capture Switch' off"
|
||||||
cset "name='ADC Capture Volume' 160"
|
cset "name='ADC Capture Volume' 160"
|
||||||
|
@ -38,8 +36,10 @@ SectionVerb {
|
||||||
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
||||||
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
||||||
]
|
]
|
||||||
|
|
||||||
DisableSequence [
|
DisableSequence [
|
||||||
]
|
]
|
||||||
|
|
||||||
Value {
|
Value {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -59,7 +59,7 @@ SectionDevice."Speaker" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Line Out Playback Volume"
|
PlaybackVolume "Line Out Playback Volume"
|
||||||
PlaybackSwitch "Line Out Playback Switch"
|
PlaybackSwitch "Line Out Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 300
|
PlaybackPriority 300
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
}
|
}
|
||||||
|
@ -79,15 +79,15 @@ SectionDevice."Earpiece" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Earpiece Playback Volume"
|
PlaybackVolume "Earpiece Playback Volume"
|
||||||
PlaybackSwitch "Earpiece Playback Switch"
|
PlaybackSwitch "Earpiece Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 100
|
PlaybackPriority 200
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."DigitalMic" {
|
SectionDevice."Mic" {
|
||||||
Comment "Internal Microphone"
|
Comment "Internal Microphone"
|
||||||
ConflictingDevice [
|
ConflictingDevice [
|
||||||
"HeadsetMic"
|
"Headset"
|
||||||
]
|
]
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='Mic1 Capture Switch' on"
|
cset "name='Mic1 Capture Switch' on"
|
||||||
|
@ -98,13 +98,16 @@ SectionDevice."DigitalMic" {
|
||||||
Value {
|
Value {
|
||||||
CapturePriority 100
|
CapturePriority 100
|
||||||
CapturePCM "hw:${CardId},0"
|
CapturePCM "hw:${CardId},0"
|
||||||
CaptureChannels "2"
|
CaptureChannels 2
|
||||||
|
CaptureMixerElem "ADC"
|
||||||
|
CaptureVolume "ADC Capture Volume"
|
||||||
|
CaptureSwitch "Mic1 Capture Switch"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."HeadsetMic" {
|
SectionDevice."Headset" {
|
||||||
Comment "Headset Microphone"
|
Comment "Headset Microphone"
|
||||||
ConflictingDevice [
|
ConflictingDevice [
|
||||||
"DigitalMic"
|
"Mic"
|
||||||
]
|
]
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='Mic2 Capture Switch' on"
|
cset "name='Mic2 Capture Switch' on"
|
||||||
|
@ -113,18 +116,21 @@ SectionDevice."HeadsetMic" {
|
||||||
cset "name='Mic2 Capture Switch' off"
|
cset "name='Mic2 Capture Switch' off"
|
||||||
]
|
]
|
||||||
Value {
|
Value {
|
||||||
CapturePriority 200
|
CapturePriority 500
|
||||||
CapturePCM "hw:${CardId},0"
|
CapturePCM "hw:${CardId},0"
|
||||||
CaptureChannels "2"
|
CaptureChannels 2
|
||||||
|
CaptureMixerElem "ADC"
|
||||||
|
CaptureVolume "ADC Capture Volume"
|
||||||
|
CaptureSwitch "Mic2 Capture Switch"
|
||||||
JackControl "Headset Microphone Jack"
|
JackControl "Headset Microphone Jack"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."Headphone" {
|
SectionDevice."Headphones" {
|
||||||
Comment "Headphones"
|
Comment "Headphones"
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
|
cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
|
||||||
cset "name='Headphone Playback Switch' on"
|
cset "name='Headphone Playback Switch' on"
|
||||||
cset "name='Headphone Playback Volume' 100%"
|
cset "name='Headphone Playback Volume' 70%"
|
||||||
]
|
]
|
||||||
|
|
||||||
DisableSequence [
|
DisableSequence [
|
||||||
|
@ -134,7 +140,7 @@ SectionDevice."Headphone" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Headphone Playback Volume"
|
PlaybackVolume "Headphone Playback Volume"
|
||||||
PlaybackSwitch "Headphone Playback Switch"
|
PlaybackSwitch "Headphone Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 500
|
PlaybackPriority 500
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
JackControl "Headphone Jack"
|
JackControl "Headphone Jack"
|
||||||
|
|
|
@ -9,7 +9,6 @@ SectionVerb {
|
||||||
cset "name='Mic2 Playback Switch' off"
|
cset "name='Mic2 Playback Switch' off"
|
||||||
cset "name='AIF1 DA0 Playback Volume' 160"
|
cset "name='AIF1 DA0 Playback Volume' 160"
|
||||||
cset "name='AIF2 DAC Playback Volume' 160"
|
cset "name='AIF2 DAC Playback Volume' 160"
|
||||||
cset "name='AIF2 DAC Stereo Playback Route' Mix Mono"
|
|
||||||
cset "name='AIF3 ADC Source Capture Route' None"
|
cset "name='AIF3 ADC Source Capture Route' None"
|
||||||
cset "name='AIF2 DAC Source Playback Route' AIF2"
|
cset "name='AIF2 DAC Source Playback Route' AIF2"
|
||||||
cset "name='DAC Playback Switch' on"
|
cset "name='DAC Playback Switch' on"
|
||||||
|
@ -41,8 +40,10 @@ SectionVerb {
|
||||||
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
||||||
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
cset "name='AIF2 ADC Mixer AIF1 DA0 Capture Switch' off"
|
||||||
]
|
]
|
||||||
|
|
||||||
DisableSequence [
|
DisableSequence [
|
||||||
]
|
]
|
||||||
|
|
||||||
Value {
|
Value {
|
||||||
PlaybackRate 8000
|
PlaybackRate 8000
|
||||||
}
|
}
|
||||||
|
@ -53,7 +54,7 @@ SectionDevice."Speaker" {
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
|
cset "name='AIF1 DA0 Stereo Playback Route' Mix Mono"
|
||||||
cset "name='Line Out Playback Switch' on"
|
cset "name='Line Out Playback Switch' on"
|
||||||
cset "name='Line Out Playback Volume' 80%"
|
cset "name='Line Out Playback Volume' 100%"
|
||||||
]
|
]
|
||||||
|
|
||||||
DisableSequence [
|
DisableSequence [
|
||||||
|
@ -63,8 +64,8 @@ SectionDevice."Speaker" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Line Out Playback Volume"
|
PlaybackVolume "Line Out Playback Volume"
|
||||||
PlaybackSwitch "Line Out Playback Switch"
|
PlaybackSwitch "Line Out Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 100
|
PlaybackPriority 300
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -83,15 +84,15 @@ SectionDevice."Earpiece" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Earpiece Playback Volume"
|
PlaybackVolume "Earpiece Playback Volume"
|
||||||
PlaybackSwitch "Earpiece Playback Switch"
|
PlaybackSwitch "Earpiece Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 300
|
PlaybackPriority 500
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."DigitalMic" {
|
SectionDevice."Mic" {
|
||||||
Comment "Internal Microphone"
|
Comment "Internal Microphone"
|
||||||
ConflictingDevice [
|
ConflictingDevice [
|
||||||
"HeadsetMic"
|
"Headset"
|
||||||
]
|
]
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='Mic1 Capture Switch' on"
|
cset "name='Mic1 Capture Switch' on"
|
||||||
|
@ -100,15 +101,18 @@ SectionDevice."DigitalMic" {
|
||||||
cset "name='Mic1 Capture Switch' off"
|
cset "name='Mic1 Capture Switch' off"
|
||||||
]
|
]
|
||||||
Value {
|
Value {
|
||||||
CapturePriority 100
|
CapturePriority 200
|
||||||
CapturePCM "hw:${CardId},0"
|
CapturePCM "hw:${CardId},0"
|
||||||
CaptureChannels "2"
|
CaptureMixerElem "ADC"
|
||||||
|
CaptureVolume "ADC Capture Volume"
|
||||||
|
CaptureSwitch "Mic1 Capture Switch"
|
||||||
|
CaptureChannels 2
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."HeadsetMic" {
|
SectionDevice."Headset" {
|
||||||
Comment "Headset Microphone"
|
Comment "Headset Microphone"
|
||||||
ConflictingDevice [
|
ConflictingDevice [
|
||||||
"DigitalMic"
|
"Mic"
|
||||||
]
|
]
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='Mic2 Capture Switch' on"
|
cset "name='Mic2 Capture Switch' on"
|
||||||
|
@ -117,18 +121,21 @@ SectionDevice."HeadsetMic" {
|
||||||
cset "name='Mic2 Capture Switch' off"
|
cset "name='Mic2 Capture Switch' off"
|
||||||
]
|
]
|
||||||
Value {
|
Value {
|
||||||
CapturePriority 200
|
CapturePriority 500
|
||||||
CapturePCM "hw:${CardId},0"
|
CapturePCM "hw:${CardId},0"
|
||||||
CaptureChannels "2"
|
CaptureChannels 2
|
||||||
|
CaptureMixerElem "ADC"
|
||||||
|
CaptureVolume "ADC Capture Volume"
|
||||||
|
CaptureSwitch "Mic2 Capture Switch"
|
||||||
JackControl "Headset Microphone Jack"
|
JackControl "Headset Microphone Jack"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
SectionDevice."Headphone" {
|
SectionDevice."Headphones" {
|
||||||
Comment "Headset"
|
Comment "Headphones"
|
||||||
EnableSequence [
|
EnableSequence [
|
||||||
cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
|
cset "name='AIF1 DA0 Stereo Playback Route' Stereo"
|
||||||
cset "name='Headphone Playback Switch' on"
|
cset "name='Headphone Playback Switch' on"
|
||||||
cset "name='Headphone Playback Volume' 70%"
|
cset "name='Headphone Playback Volume' 100%"
|
||||||
]
|
]
|
||||||
|
|
||||||
DisableSequence [
|
DisableSequence [
|
||||||
|
@ -138,7 +145,7 @@ SectionDevice."Headphone" {
|
||||||
Value {
|
Value {
|
||||||
PlaybackVolume "Headphone Playback Volume"
|
PlaybackVolume "Headphone Playback Volume"
|
||||||
PlaybackSwitch "Headphone Playback Switch"
|
PlaybackSwitch "Headphone Playback Switch"
|
||||||
PlaybackChannels "2"
|
PlaybackChannels 2
|
||||||
PlaybackPriority 500
|
PlaybackPriority 500
|
||||||
PlaybackPCM "hw:${CardId},0"
|
PlaybackPCM "hw:${CardId},0"
|
||||||
JackControl "Headphone Jack"
|
JackControl "Headphone Jack"
|
||||||
|
|
Loading…
Reference in New Issue
Block a user