From dc37156a18aa43c9c66b31f825b1bf4d10ed5bab Mon Sep 17 00:00:00 2001 From: Dmitry Kovalev Date: Mon, 18 Jun 2018 17:05:18 -0700 Subject: [PATCH] Remove asound configuration. We don't use it. Everything is PulseAudo-based + UCM configs. Change-Id: Ib5a5204480aa74cd76da6de185be526e045b908f --- scripts/asound.conf | 30 ----------------------- scripts/install-alsa-config.sh | 45 ---------------------------------- 2 files changed, 75 deletions(-) delete mode 100755 scripts/asound.conf delete mode 100755 scripts/install-alsa-config.sh diff --git a/scripts/asound.conf b/scripts/asound.conf deleted file mode 100755 index 951ddade..00000000 --- a/scripts/asound.conf +++ /dev/null @@ -1,30 +0,0 @@ -options snd_rpi_googlevoicehat_soundcard index=0 - -pcm.softvol { - type softvol - slave.pcm dmix - control { - name Master - card 0 - } -} - -pcm.micboost { - type route - slave.pcm dsnoop - ttable { - 0.0 30.0 - 1.1 30.0 - } -} - -pcm.!default { - type asym - playback.pcm "plug:softvol" - capture.pcm "plug:micboost" -} - -ctl.!default { - type hw - card 0 -} diff --git a/scripts/install-alsa-config.sh b/scripts/install-alsa-config.sh deleted file mode 100755 index e81b71dc..00000000 --- a/scripts/install-alsa-config.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/bash -# -# Replace the Raspberry Pi's default ALSA config with one for the voiceHAT. -# -# Copyright 2017 Google Inc. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -set -o errexit - -if [[ $EUID -ne 0 ]]; then - echo "This script must be run as root (use sudo)" 1>&2 - exit 1 -fi - -cd "$(dirname "${BASH_SOURCE[0]}")/.." - -asoundrc=/home/pi/.asoundrc -global_asoundrc=/etc/asound.conf - -for rcfile in "$asoundrc" "$global_asoundrc"; do - if [[ -f "$rcfile" ]] ; then - echo "Renaming $rcfile to $rcfile.bak..." - sudo mv "$rcfile" "$rcfile.bak" - fi -done - -sudo cp scripts/asound.conf "$global_asoundrc" -echo "Installed voiceHAT ALSA config at $global_asoundrc" - -# TODO(rodrigoq): it shouldn't be necessary to install at both locations, but -# if we don't install to $HOME then the volume widget (volumealsa) has a -# tendency to create an incompatible ~/.asoundrc and break the Voice Kit audio. -sudo cp scripts/asound.conf "$asoundrc" -echo "Installed voiceHAT ALSA config at $asoundrc"