Skip to content

Commit

Permalink
Patch: updated and added ALSA/PulseAudio configuration files
Browse files Browse the repository at this point in the history
  • Loading branch information
ppaulweber committed Sep 6, 2019
1 parent abe7910 commit a53e14b
Show file tree
Hide file tree
Showing 5 changed files with 151 additions and 28 deletions.
16 changes: 12 additions & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,18 @@ install-modules: $(MODULE)/kernel/extra

install-systemd:
@echo "-- Installing systemd configuration"
cp -f setup-etc-modules-load.d-bce.conf /etc/modules-load.d/bce.conf
cp -f setup-etc-modules-load.d-spi.conf /etc/modules-load.d/spi.conf
cp -f setup-usr-share-alsa-cards-apple_t2.conf /usr/share/alsa/cards/AppleT2.conf
cp -f setup-usr-lib-systemd-system-brcmfmac.service /usr/lib/systemd/system/brcmfmac.service
cp -f setup-etc-modules-load.d-bce.conf \
/etc/modules-load.d/bce.conf
cp -f setup-etc-modules-load.d-spi.conf \
/etc/modules-load.d/spi.conf
cp -f setup-usr-lib-systemd-system-brcmfmac.service \
/usr/lib/systemd/system/brcmfmac.service
cp -f setup-usr-lib-udev-rules.d-91-pulseaudio-custom.rules \
/usr/lib/udev/rules.d/91-pulseaudio-custom.rules
cp -f setup-usr-share-alsa-cards-AppleT2.conf \
/usr/share/alsa/cards/AppleT2.conf
cp -f setup-usr-share-pulseaudio-alsa-mixer-profile-sets-apple-t2.conf \
/usr/share/pulseaudio/alsa-mixer/profile-sets/apple-t2.conf

systemd:
@echo "-- Updating systemd environment"
Expand Down
7 changes: 7 additions & 0 deletions setup-usr-lib-udev-rules.d-91-pulseaudio-custom.rules
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
SUBSYSTEM!="sound", GOTO="pulseaudio_end"
ACTION!="change", GOTO="pulseaudio_end"
KERNEL!="card*", GOTO="pulseaudio_end"

SUBSYSTEMS=="pci", ATTRS{vendor}=="0x106b", ATTRS{device}=="0x1803", ENV{PULSE_PROFILE_SET}="apple-t2.conf"

LABEL="pulseaudio_end"
77 changes: 77 additions & 0 deletions setup-usr-share-alsa-cards-AppleT2.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
<confdir:pcm/front.conf>
<confdir:pcm/surround40.conf>

AppleT2.pcm.default {
@args [ CARD ]
@args.CARD {
type string
}

type asym
playback.pcm {
type plug
slave.pcm {
type hw
card $CARD
device 0
}
}
capture.pcm {
type plug
slave.pcm {
type hw
card $CARD
device 1
}
}
hint.device_output 0
hint.device_input 1
}

AppleT2.pcm.front.0 {
@args [ CARD ]
@args.CARD {
type string
}
type asym
playback.pcm {
type hw
card $CARD
device 0
}
capture.pcm {
type hw
card $CARD
device 1
}
hint.device_output 0
hint.device_input 1
}
AppleT2.pcm.front.1 {
@args [ CARD ]
@args.CARD {
type string
}
type asym
playback.pcm {
type hw
card $CARD
device 2
}
capture.pcm {
type hw
card $CARD
device 3
}
hint.device_output 2
hint.device_input 3
}
AppleT2.pcm.front.2 {
@args [ CARD ]
@args.CARD {
type string
}
type hw
card $CARD
device 4
}
24 changes: 0 additions & 24 deletions setup-usr-share-alsa-cards-apple_t2.conf

This file was deleted.

55 changes: 55 additions & 0 deletions setup-usr-share-pulseaudio-alsa-mixer-profile-sets-apple-t2.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
[General]
auto-profiles = no

[Mapping builtin-speaker]
description = Built-in Speaker
device-strings = front:%f
paths-output = builtin-speaker-output
channel-map = front-left,front-right,rear-left,rear-right
priority = 100
direction = output

[Mapping builtin-mic]
description = Built-in Mic
device-strings = front:%f
paths-output = builtin-mic-input
channel-map = left,center,right
priority = 100
direction = input

[Mapping codec-output]
description = Headphone
device-strings = front:%f,1
paths-output = codec-output
channel-map = left,right
priority = 100
direction = output

[Mapping codec-input]
description = Headphone Mic
device-strings = front:%f,1
paths-output = codec-input
channel-map = mono
priority = 100
direction = input

[Profile output:builtin-speaker+input:builtin-mic]
description = Built-in Speaker + Built-in Mic
output-mappings = builtin-speaker
input-mappings = builtin-mic
skip-probe = yes

[Profile output:codec-output+input:builtin-mic]
description = Headphones + Built-in Mic
output-mappings = codec-output
input-mappings = builtin-mic

[Profile output:codec-output+input:codec-input]
description = Headphones + External Mic
output-mappings = codec-output
input-mappings = codec-input

[Profile output:builtin-speaker+input:codec-input]
description = Built-in Speaker + External Mic
output-mappings = builtin-speaker
input-mappings = codec-input

0 comments on commit a53e14b

Please sign in to comment.