rixty/OpenVoiceOS
1
1
Fork 0
mirror of https://github.com/OpenVoiceOS/OpenVoiceOS synced 2025-06-05 22:19:21 +02:00
Code Issues Releases Wiki Activity

Small changes to the sound system

Browse Source
This commit is contained in:
j1nx
2022-03-15 21:34:20 +01:00
parent e0ba6d8b37
commit 2bf421728c
2 changed files with 22 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
buildroot-external/board/raspberrypi/rootfs-overlay/usr/libexec/ovos-i2csound
View File

@ -16,6 +16,7 @@
########################################################################## ##########################################################################
# Set default configurations # Set default configurations
ASOUND_STATE=/var/lib/alsa/default-asound.state
PULSE_SYSTEM=/etc/pulse/pulseaudio-system.pa PULSE_SYSTEM=/etc/pulse/pulseaudio-system.pa
PULSE_DAEMON=/etc/pulse/pulseaudio-daemon.conf PULSE_DAEMON=/etc/pulse/pulseaudio-daemon.conf
@ -64,15 +65,23 @@ fi
if [ -f /etc/pulse/daemon.conf ] ; then if [ -f /etc/pulse/daemon.conf ] ; then
rm /etc/pulse/daemon.conf rm /etc/pulse/daemon.conf
fi fi
if [ -f /var/lib/alsa/asound.state ] ; then
rm /var/lib/alsa/asound.state
fi
if [ -f /etc/ovos_asound.state ] ; then
rm /etc/ovos_asound.state
fi
if [ "$RESPEAKER2" == "found" ] && [ "$RESPEAKER4" != "found" ] ; then if [ "$RESPEAKER2" == "found" ] && [ "$RESPEAKER4" != "found" ] ; then
echo "Installing and configuring ReSpeaker 2-mic" echo "Installing and configuring ReSpeaker 2-mic"
dtoverlay seeed-2mic-voicecard dtoverlay seeed-2mic-voicecard
ASOUND_STATE=/etc/voicecard/wm8960_asound.state
fi fi
if [ "${RESPEAKER6}" == "found" ] && [ "${RESPEAKER4}" != "found" ] ; then if [ "${RESPEAKER6}" == "found" ] && [ "${RESPEAKER4}" != "found" ] ; then
echo "Installing and configuring ReSpeaker 4-mic" echo "Installing and configuring ReSpeaker 4-mic"
dtoverlay seeed-4mic-voicecard dtoverlay seeed-4mic-voicecard
ASOUND_STATE=/etc/voicecard/ac108_asound.state
PULSE_SYSTEM=/etc/pulse/seeed-voicecard-4mic-default.pa PULSE_SYSTEM=/etc/pulse/seeed-voicecard-4mic-default.pa
PULSE_DAEMON=/etc/pulse/seeed-voicecard-4mic-daemon.conf PULSE_DAEMON=/etc/pulse/seeed-voicecard-4mic-daemon.conf
fi fi
@ -80,6 +89,7 @@ fi
if [ "{$RESPEAKER6}" == "found" ] && [ "${RESPEAKER4}" == "found" ] ; then if [ "{$RESPEAKER6}" == "found" ] && [ "${RESPEAKER4}" == "found" ] ; then
echo "Installing and configuring ReSpeaker 6mic" echo "Installing and configuring ReSpeaker 6mic"
dtoverlay seeed-8mic-voicecard dtoverlay seeed-8mic-voicecard
ASOUND_STATE=/etc/voicecard/ac108_6mic.state
PULSE_SYSTEM=/etc/pulse/seeed-voicecard-8mic-default.pa PULSE_SYSTEM=/etc/pulse/seeed-voicecard-8mic-default.pa
PULSE_DAEMON=/etc/pulse/seeed-voicecard-8mic-daemon.conf PULSE_DAEMON=/etc/pulse/seeed-voicecard-8mic-daemon.conf
fi fi
@ -105,8 +115,16 @@ if [ "$TAS5806" ] && [ "$SJ201LED" ]; then
PULSE_DAEMON=/etc/pulse/mycroft-sj201-daemon.conf PULSE_DAEMON=/etc/pulse/mycroft-sj201-daemon.conf
fi fi
# Install soundstate
echo "create asound status file"
ln -s $ASOUND_STATE /etc/ovos_asound.state
ln -s $ASOUND_STATE /var/lib/alsa/asound.state
# Install pulseaudio files # Install pulseaudio files
echo "create pulse system file" echo "create pulse system file"
ln -s $PULSE_SYSTEM /etc/pulse/system.pa ln -s $PULSE_SYSTEM /etc/pulse/system.pa
echo "create pulse daemon file" echo "create pulse daemon file"
ln -s $PULSE_DAEMON /etc/pulse/daemon.conf ln -s $PULSE_DAEMON /etc/pulse/daemon.conf
# Restore sound levels
alsactl -E HOME=/run/alsa -f /etc/ovos_asound.state restore

3
buildroot-external/rootfs-overlay/etc/pulse/mycroft-sj201-daemon.conf
View File

@ -92,4 +92,7 @@
resample-method = ffmpeg resample-method = ffmpeg
default-sample-format = s32le default-sample-format = s32le
default-sample-rate = 48000 default-sample-rate = 48000
alternate-sample-rate = 44100
default-sample-channels = 2
default-channel-map = front-left,front-right
flat-volumes = no flat-volumes = no