diff --git a/Dockerfile b/Dockerfile index 4b29573..2ea9649 100644 --- a/Dockerfile +++ b/Dockerfile @@ -311,6 +311,7 @@ ENV MOD_MDNS_NAME="Speakeasy" # Will default to "default" ENV MOD_AUDIO_DEVICE="" +ENV MOD_AUDIO_OUTPUT=alsa ENV MOD_AUDIO_MIXER="" ENV MOD_AUDIO_MODE="stereo" ENV MOD_AUDIO_VOLUME_DEFAULT="-20.0" diff --git a/context/runtime/boot/config.sh b/context/runtime/boot/config.sh index 708f137..789d65b 100644 --- a/context/runtime/boot/config.sh +++ b/context/runtime/boot/config.sh @@ -59,9 +59,6 @@ export SHAIRPORT_MQTT_PORT="${SHAIRPORT_MQTT_PORT:-1883}" # Useful for rpi4 export SHAIRPORT_GENERAL_INTERPOLATION="${SHAIRPORT_GENERAL_INTERPOLATION:-basic}" -# shellcheck disable=SC2034 -export SHAIRPORT_GENERAL_OUTPUT_BACKEND="alsa" -# shellcheck disable=SC2034 export SHAIRPORT_GENERAL_MDNS_BACKEND="avahi" # Just airplay 1 export SHAIRPORT_GENERAL_UDP_PORT_BASE="6000" diff --git a/context/runtime/boot/entrypoint.sh b/context/runtime/boot/entrypoint.sh index b355f7d..f418d68 100755 --- a/context/runtime/boot/entrypoint.sh +++ b/context/runtime/boot/entrypoint.sh @@ -42,6 +42,7 @@ helpers::logger::log DEBUG "[entrypoint]" "Preparing configuration" # Connect specific env variables to shairport scheme export SHAIRPORT_GENERAL_NAME="$MOD_MDNS_NAME" export SHAIRPORT_GENERAL_PORT="${ADVANCED_PORT:-7000}" +export SHAIRPORT_GENERAL_OUTPUT_BACKEND="${MOD_AUDIO_OUTPUT:-alsa}" # Useful for nightingale export SHAIRPORT_GENERAL_PLAYBACK_MODE="${MOD_AUDIO_MODE:-stereo}" # Useful for all