Enhancements

Enable the AirPlay 2 build to operate an optional classic-AirPlay-only service or to gracefully degrade to classic AirPlay, as follows:
  1. Add a new command-line option '-—service-type=<type>' and an equivalent configuration entry 'service_type = "<type>"' in the 'general' section of the configuration file,
     where <type> can be "auto", "classic" or "airplay2":
      1. "auto" (default) means that the service will be AirPlay 2 if NQPTP is running. If NQPTP is not running, classic AirPlay service will be provided instead, and in that case,
      "(Classic)" will be appended to the default AirPlay service name visible to AirPlay clients like Apple Music, for example "RaspberryPi3B (Classic)".
      2. "classic" means the service will be classic AirPlay (aka AirPlay 1).
      3. "airplay2" means the service will be the modern AirPlay 2. In this case, as distinct from "auto", if NQPTP is not running, Shairport Sync will log an error and terminate.
  2. In the systemd service file, NQPTP is now a "Want" rather than a "Require". If it's present, then it will be launched before Shairport Sync. If it's absent, Shairport Sync will launch anyway.
  3. Improve the delivery of input format changes and emit 'sdsc' metadata when changes occur.
  4. Emit new format information in the log if statistics is enabled.

Docker Changes
  1. Support for linux/arm/v6 has been dropped, as Docker is no longer supported.
  2. NQPTP is not started in the AirPlay 2 Docker image if '--service-type=classic' or '--service-type=airplay1' is in the command line options at the end of the docker run command.
     The purpose is to ensure that ports 319 and 320 are left alone when the AirPlay 2 image is set to provide Classic service only.
     Note that setting the configuration file 'service_type' to 'classic' will not prevent NQPTP from starting up -- you must use the command line option.
  3. A new "dev" target has been added. It is a large image containing the custom-built FFmpeg library, NQPTP, Avahi and D-Bus along with the Shairport Sync source and
     all necessary development tools. When started, Avahi, D-Bus and NQPTP are all installed and running. The bash shell has also been added and is entered.

Stability Improvements
  Reorganise session preemption to fully terminate the existing session before starting a new one.
  Don't delay closing the event port to wait for it to be closed at the client end.
  Add a safe_socket_close() function to ensure sockets are fully closed. Use -1 to designate closed rather than 0, to prevent attempts to reclose sockets, causing mayhem.
  Re-order FFmpeg decommissioning during teardown.

docker/Dockerfile

@@ -106,6 +106,33 @@ RUN DESTDIR=install make install
 WORKDIR /
 ##### SPS END #####
 
+# Shairport Sync Development Environment
+# This (large) image contains the custom-built FFmpeg library and NQPTP, Avahi, D-Bus, etc., Shairport Sync source and all tools.
+# When started, D-Bus, Avahi and NQPTP are set to run in the background.
+# To build it, here is a sample local build instruction:
+# $ docker build --build-arg SHAIRPORT_SYNC_BRANCH=development --build-arg NQPTP_BRANCH=main --target dev -t shairport-sync-dev -f docker/Dockerfile .
+# Sample local use (remember to save your changes):
+# $ docker run -it \
+#   --cap-add=SYS_NICE --net host --device /dev/snd \
+#   -v /etc/shairport-sync.conf:/etc/shairport-sync.conf \
+#   shairport-sync-dev
+
+##### DEV #####
+FROM shairport-sync AS dev
+RUN apk add bash
+
+RUN addgroup shairport-sync && \
+        adduser -D shairport-sync -G shairport-sync && \
+        addgroup -g 29 docker_audio && \
+        addgroup shairport-sync docker_audio && \
+        addgroup shairport-sync audio && \
+        mkdir -p /run/dbus
+
+COPY --from=nqptp /nqptp/nqptp /usr/local/bin/nqptp
+COPY --chmod=755 ./docker/devrun.sh ./devrun.sh
+ENTRYPOINT ["./devrun.sh"]
+##### DEV END #####
+
 ##### STATIC FILES #####
 FROM scratch AS files
 

docker/devrun.sh

@@ -0,0 +1,36 @@
+#!/bin/bash
+# exit if any command returns a non-zero result
+set -e
+echo "Shairport Sync Dev Startup ($(date))"
+if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
+  rm -rf /run/dbus/dbus.pid
+  rm -rf /run/avahi-daemon/pid
+  dbus-uuidgen --ensure
+  dbus-daemon --system
+  avahi-daemon --daemonize --no-chroot
+fi
+# Don't launch NQPTP if classic only
+SERVICE_TYPE=""
+for arg in "$@"; do
+  case "$arg" in
+    --service-type=classic|--service-type=airplay1)
+      SERVICE_TYPE="${arg#--service-type=}"
+      ;;
+  esac
+done
+if [ -z "$SERVICE_TYPE" ]; then
+  # not looking for Classic aka AirPlay 1 so start NQPTP for AirPlay 2
+  echo "Starting NQPTP ($(date))"
+  (/usr/local/bin/nqptp > /dev/null 2>&1) &
+fi
+while [ ! -f /var/run/avahi-daemon/pid ]; do
+  echo "Warning: avahi is not running, sleeping for 5 seconds before checking again"
+  sleep 5
+done
+# for PipeWire
+export XDG_RUNTIME_DIR=/tmp
+# for PulseAudio
+export PULSE_SERVER=unix:/tmp/pulseaudio.socket
+export PULSE_COOKIE=/tmp/pulseaudio.cookie
+echo "Finished startup tasks ($(date)), starting bash."
+exec /bin/bash

docker/run.sh

@@ -15,9 +15,23 @@ if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
   avahi-daemon --daemonize --no-chroot
 fi
 
-echo "Starting NQPTP ($(date))"
+# Don't launch NQPTP if it classic only
 
-(/usr/local/bin/nqptp > /dev/null 2>&1) &
+SERVICE_TYPE=""
+
+for arg in "$@"; do
+  case "$arg" in
+    --service-type=classic|--service-type=airplay1)
+      SERVICE_TYPE="${arg#--service-type=}"
+      ;;
+  esac
+done
+
+if [ -z "$SERVICE_TYPE" ]; then
+  # not looking for Classic aka AirPlay 1 so start NQPTP for AirPlay 2
+  echo "Starting NQPTP ($(date))"
+  (/usr/local/bin/nqptp > /dev/null 2>&1) &
+fi
 
 while [ ! -f /var/run/avahi-daemon/pid ]; do
   echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"