From 906e99b792329d57f286763886c681b8d8e9f0c4 Mon Sep 17 00:00:00 2001 From: Colin Guthrie Date: Thu, 7 Jul 2011 10:42:35 +0100 Subject: [PATCH] alsa-mixer: Remove workaround for USB head/handsets Now that subset mixer paths are removed, this workaround is no longer needed. This effectively reverts 1c38b5d4787d9466bd7bd5910d27e501298ec778 but due to me forgetting to add files and adding a couple extra workarounds after, it's easier to just do this manually rather than run git-revert. --- src/Makefile.am | 3 +- .../alsa/mixer/profile-sets/90-pulseaudio.rules | 9 ------ .../alsa/mixer/profile-sets/usb-headset.conf | 35 ---------------------- 3 files changed, 1 insertion(+), 46 deletions(-) delete mode 100644 src/modules/alsa/mixer/profile-sets/usb-headset.conf diff --git a/src/Makefile.am b/src/Makefile.am index 9117004..ebf5ebc 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1069,8 +1069,7 @@ dist_alsaprofilesets_DATA = \ modules/alsa/mixer/profile-sets/native-instruments-traktor-audio6.conf \ modules/alsa/mixer/profile-sets/native-instruments-traktor-audio10.conf \ modules/alsa/mixer/profile-sets/native-instruments-traktorkontrol-s4.conf \ - modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf \ - modules/alsa/mixer/profile-sets/usb-headset.conf + modules/alsa/mixer/profile-sets/native-instruments-korecontroller.conf if HAVE_UDEV dist_udevrules_DATA = \ diff --git a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules index e1da331..0329340 100644 --- a/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules +++ b/src/modules/alsa/mixer/profile-sets/90-pulseaudio.rules @@ -20,15 +20,6 @@ SUBSYSTEM!="sound", GOTO="pulseaudio_end" ACTION!="change", GOTO="pulseaudio_end" KERNEL!="card*", GOTO="pulseaudio_end" -# Some specific work arounds until we can handle heasets/handsets properly (i.e. "Speaker" only, no "master") -SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="01ab", ENV{PULSE_PROFILE_SET}="usb-headset.conf" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="046d", ATTRS{idProduct}=="0a0c", ENV{PULSE_PROFILE_SET}="usb-headset.conf" -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1395", ATTRS{idProduct}=="0002", ENV{PULSE_PROFILE_SET}="usb-headset.conf" -# UAC1.0 Sennheiser Dongle -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1395", ATTRS{idProduct}=="3554", ENV{PULSE_PROFILE_SET}="usb-headset.conf" -# BT Agile Handset -SUBSYSTEMS=="usb", ATTRS{idVendor}=="1885", ATTRS{idProduct}=="0501", ENV{PULSE_PROFILE_SET}="usb-headset.conf" - SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="1978", ENV{PULSE_PROFILE_SET}="native-instruments-audio8dj.conf" SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="0839", ENV{PULSE_PROFILE_SET}="native-instruments-audio4dj.conf" SUBSYSTEMS=="usb", ATTRS{idVendor}=="17cc", ATTRS{idProduct}=="baff", ENV{PULSE_PROFILE_SET}="native-instruments-traktorkontrol-s4.conf" diff --git a/src/modules/alsa/mixer/profile-sets/usb-headset.conf b/src/modules/alsa/mixer/profile-sets/usb-headset.conf deleted file mode 100644 index adf78d1..0000000 --- a/src/modules/alsa/mixer/profile-sets/usb-headset.conf +++ /dev/null @@ -1,35 +0,0 @@ -# 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, write to the Free Software Foundation, -# Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. - -; This is a workaround - these usb headsets have one output volume control only, labeled "Speaker". -; This causes the default profile set to not control the volume at all, which is a bug. - -[General] -auto-profiles = yes - -[Mapping analog-mono] -device-strings = hw:%f -channel-map = mono -paths-output = analog-output-speaker -paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line -priority = 1 - -[Mapping analog-stereo] -device-strings = front:%f hw:%f -channel-map = left,right -paths-output = analog-output-speaker -paths-input = analog-input analog-input-mic analog-input-linein analog-input-aux analog-input-video analog-input-tvtuner analog-input-fm analog-input-mic-line -priority = 10 -- 2.7.4