mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-04 13:29:59 -05:00
alsa-mixer: Add an explicit profile-set for Audigy devices
These lost analog-mono support when we made that a fallback profile, as the stereo-fallback would be picked up as the only input profile, and that does not work in duplex mode. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/750
This commit is contained in:
parent
f003d6ca62
commit
460d0c0b79
3 changed files with 106 additions and 0 deletions
|
|
@ -1353,6 +1353,7 @@ dist_alsaprofilesets_DATA = \
|
||||||
modules/alsa/mixer/profile-sets/default.conf \
|
modules/alsa/mixer/profile-sets/default.conf \
|
||||||
modules/alsa/mixer/profile-sets/force-speaker.conf \
|
modules/alsa/mixer/profile-sets/force-speaker.conf \
|
||||||
modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf \
|
modules/alsa/mixer/profile-sets/force-speaker-and-int-mic.conf \
|
||||||
|
modules/alsa/mixer/profile-sets/audigy.conf \
|
||||||
modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
|
modules/alsa/mixer/profile-sets/maudio-fasttrack-pro.conf \
|
||||||
modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
|
modules/alsa/mixer/profile-sets/native-instruments-audio4dj.conf \
|
||||||
modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
|
modules/alsa/mixer/profile-sets/native-instruments-audio8dj.conf \
|
||||||
|
|
|
||||||
|
|
@ -19,6 +19,7 @@ SUBSYSTEM!="sound", GOTO="pulseaudio_end"
|
||||||
ACTION!="change", GOTO="pulseaudio_end"
|
ACTION!="change", GOTO="pulseaudio_end"
|
||||||
KERNEL!="card*", GOTO="pulseaudio_end"
|
KERNEL!="card*", GOTO="pulseaudio_end"
|
||||||
SUBSYSTEMS=="usb", GOTO="pulseaudio_check_usb"
|
SUBSYSTEMS=="usb", GOTO="pulseaudio_check_usb"
|
||||||
|
SUBSYSTEMS=="pci", GOTO="pulseaudio_check_pci"
|
||||||
SUBSYSTEMS=="firewire", GOTO="pulseaudio_firewire_quirk"
|
SUBSYSTEMS=="firewire", GOTO="pulseaudio_firewire_quirk"
|
||||||
|
|
||||||
SUBSYSTEMS=="platform", DRIVERS=="thinkpad_acpi", ENV{PULSE_IGNORE}="1"
|
SUBSYSTEMS=="platform", DRIVERS=="thinkpad_acpi", ENV{PULSE_IGNORE}="1"
|
||||||
|
|
@ -143,6 +144,16 @@ ATTRS{idVendor}=="0951", ATTRS{idProduct}=="1703", ENV{ID_ID}="usb-HyperX_Cloud_
|
||||||
|
|
||||||
GOTO="pulseaudio_end"
|
GOTO="pulseaudio_end"
|
||||||
|
|
||||||
|
LABEL="pulseaudio_check_pci"
|
||||||
|
|
||||||
|
# Creative SoundBlaster Audigy-based cards
|
||||||
|
# EMU10k2/CA0100/CA0102/CA10200
|
||||||
|
ATTRS{vendor}=="0x1102", ATTRS{device}=="0x0004", ENV{PULSE_PROFILE_SET}="audigy.conf"
|
||||||
|
# CA0108/CA10300
|
||||||
|
ATTRS{vendor}=="0x1102", ATTRS{device}=="0x0008", ENV{PULSE_PROFILE_SET}="audigy.conf"
|
||||||
|
|
||||||
|
GOTO="pulseaudio_end"
|
||||||
|
|
||||||
LABEL="pulseaudio_firewire_quirk"
|
LABEL="pulseaudio_firewire_quirk"
|
||||||
|
|
||||||
# Focusrite Saffire Pro 10/26 i/o has a quirk to disappear from IEEE 1394 bus when losing connections.
|
# Focusrite Saffire Pro 10/26 i/o has a quirk to disappear from IEEE 1394 bus when losing connections.
|
||||||
|
|
|
||||||
94
src/modules/alsa/mixer/profile-sets/audigy.conf
Normal file
94
src/modules/alsa/mixer/profile-sets/audigy.conf
Normal file
|
|
@ -0,0 +1,94 @@
|
||||||
|
# This file is part of PulseAudio.
|
||||||
|
#
|
||||||
|
# PulseAudio is free software; you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU Lesser General Public License as
|
||||||
|
# published by the Free Software Foundation; either version 2.1 of the
|
||||||
|
# License, or (at your option) any later version.
|
||||||
|
#
|
||||||
|
# PulseAudio is distributed in the hope that it will be useful, but
|
||||||
|
# WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
||||||
|
# General Public License for more details.
|
||||||
|
#
|
||||||
|
# You should have received a copy of the GNU Lesser General Public License
|
||||||
|
# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
|
||||||
|
|
||||||
|
; Creative Sound Blaster Audigy product line
|
||||||
|
;
|
||||||
|
; These are just copies of the mappings we find in default.conf, with the
|
||||||
|
; small change of making analog-stereo and analog-mono non-fallback mappings.
|
||||||
|
; This is needed because these cards only support duplex profiles with mono
|
||||||
|
; inputs, and in the default configuration, with stereo being a fallback
|
||||||
|
; mapping, the mono mapping is never tried.
|
||||||
|
;
|
||||||
|
; See default.conf for an explanation on the directives used here.
|
||||||
|
|
||||||
|
[General]
|
||||||
|
auto-profiles = yes
|
||||||
|
|
||||||
|
# Based on stereo-fallback
|
||||||
|
[Mapping analog-stereo]
|
||||||
|
device-strings = hw:%f
|
||||||
|
channel-map = front-left,front-right
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2
|
||||||
|
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headphone-mic analog-input-headset-mic
|
||||||
|
priority = 1
|
||||||
|
|
||||||
|
# Based on mono-fallback
|
||||||
|
[Mapping analog-mono]
|
||||||
|
device-strings = hw:%f
|
||||||
|
channel-map = mono
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker analog-output-headphones analog-output-headphones-2 analog-output-mono
|
||||||
|
paths-input = analog-input-front-mic analog-input-rear-mic analog-input-internal-mic analog-input-dock-mic analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line analog-input-headset-mic
|
||||||
|
priority = 1
|
||||||
|
|
||||||
|
# The rest of these are identical to what's in default.conf
|
||||||
|
[Mapping analog-surround-21]
|
||||||
|
device-strings = surround21:%f
|
||||||
|
channel-map = front-left,front-right,lfe
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 13
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping analog-surround-40]
|
||||||
|
device-strings = surround40:%f
|
||||||
|
channel-map = front-left,front-right,rear-left,rear-right
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 12
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping analog-surround-41]
|
||||||
|
device-strings = surround41:%f
|
||||||
|
channel-map = front-left,front-right,rear-left,rear-right,lfe
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 13
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping analog-surround-50]
|
||||||
|
device-strings = surround50:%f
|
||||||
|
channel-map = front-left,front-right,rear-left,rear-right,front-center
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 12
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping analog-surround-51]
|
||||||
|
device-strings = surround51:%f
|
||||||
|
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 13
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping analog-surround-71]
|
||||||
|
device-strings = surround71:%f
|
||||||
|
channel-map = front-left,front-right,rear-left,rear-right,front-center,lfe,side-left,side-right
|
||||||
|
description = Analog Surround 7.1
|
||||||
|
paths-output = analog-output analog-output-lineout analog-output-speaker
|
||||||
|
priority = 12
|
||||||
|
direction = output
|
||||||
|
|
||||||
|
[Mapping iec958-stereo]
|
||||||
|
device-strings = iec958:%f
|
||||||
|
channel-map = left,right
|
||||||
|
paths-input = iec958-stereo-input
|
||||||
|
paths-output = iec958-stereo-output
|
||||||
|
priority = 5
|
||||||
Loading…
Add table
Add a link
Reference in a new issue