From 8bc4f87a5926fec276de26593fce8bf73b61816c Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:28:58 +0000 Subject: [PATCH 1/5] Include the man page and man utilities in the Docker image. --- docker/Dockerfile | 7 ++++++- docker/classic/Dockerfile | 8 ++++++-- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 89308350..5a6bc678 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -83,10 +83,15 @@ RUN apk -U add \ ffmpeg \ libsodium \ libgcrypt \ - libplist + libplist \ + mandoc \ + man-pages \ + less \ + less-doc # Copy build files. COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync +COPY --from=builder /shairport-sync/build/install/usr/local/share/man/man7 /usr/share/man/man7 COPY --from=builder /usr/local/bin/nqptp /usr/local/bin/nqptp COPY --from=builder /usr/local/lib/libalac.* /usr/local/lib/ COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf /etc/ diff --git a/docker/classic/Dockerfile b/docker/classic/Dockerfile index 65ba957d..03baac5e 100644 --- a/docker/classic/Dockerfile +++ b/docker/classic/Dockerfile @@ -62,11 +62,15 @@ RUN apk -U add \ avahi-tools \ libconfig \ mosquitto \ - libsndfile-dev - + libsndfile-dev \ + mandoc \ + man-pages \ + less \ + less-doc # Copy build files. COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync +COPY --from=builder /shairport-sync/build/install/usr/local/share/man/man7 /usr/share/man/man7 COPY --from=builder /usr/local/lib/libalac.* /usr/local/lib/ COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf /etc/ COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf.sample /etc/ From 712fc047347e8520d912f821d5e60f8b859182cc Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:36:43 +0000 Subject: [PATCH 2/5] Quieten a compiler warning. --- player.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/player.c b/player.c index 9206e5da..61b4e5ff 100644 --- a/player.c +++ b/player.c @@ -1838,7 +1838,7 @@ void player_thread_cleanup_handler(void *arg) { void *player_thread_func(void *arg) { rtsp_conn_info *conn = (rtsp_conn_info *)arg; #ifdef CONFIG_METADATA - uint64_t time_of_last_metadata_progress_update; + uint64_t time_of_last_metadata_progress_update = 0; // the assignment is to stop a compiler warning... #endif uint64_t previous_frames_played = 0; // initialised to avoid a "possibly uninitialised" warning uint64_t previous_raw_measurement_time = From 8e5393ec42472e67bc1b07d2a71b3369874a6a0a Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:37:22 +0000 Subject: [PATCH 3/5] Parse phbt/phb0 metddata tokens. --- mqtt.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mqtt.c b/mqtt.c index cf2e2388..f662009d 100644 --- a/mqtt.c +++ b/mqtt.c @@ -197,6 +197,12 @@ void mqtt_process_metadata(uint32_t type, uint32_t code, char *data, uint32_t le case 'daid': mqtt_publish("dacp_id", data, length); break; + case 'phbt': + mqtt_publish("frame_position_and_time", data, length); + break; + case 'phb0': + mqtt_publish("first_frame_position_and_time", data, length); + break; case 'ofmt': mqtt_publish("output_format", data, length); break; From 2261940944caa359fedbab210e8926a023478097 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:48:43 +0000 Subject: [PATCH 4/5] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 0444e5dc..2450f886 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -1,3 +1,9 @@ +Version 4.1-dev-824-g8e5393ec +==== +**Enhancements** +* Add `man` page and `man` utilities to the Docker images. +* Enable the MQTT client to parse the `phbt` and `phb0` Playing HeartBeaT metadata tokens. + Version 4.1-dev-818-gf15c3255 ==== **Enhancement** From a649a8ca2a943de2d50ca6af2363603642e14f40 Mon Sep 17 00:00:00 2001 From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 5 Dec 2022 11:49:23 +0000 Subject: [PATCH 5/5] Update RELEASENOTES-DEVELOPMENT.md --- RELEASENOTES-DEVELOPMENT.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RELEASENOTES-DEVELOPMENT.md b/RELEASENOTES-DEVELOPMENT.md index 2450f886..a63adc5a 100644 --- a/RELEASENOTES-DEVELOPMENT.md +++ b/RELEASENOTES-DEVELOPMENT.md @@ -12,7 +12,7 @@ Version 4.1-dev-818-gf15c3255 Version 4.1-dev-815-gcb097034 ==== **Enhancement** -* Use [TCP `keepalive`](https://en.wikipedia.org/wiki/Keepalive) to close down a play session when the client disappears, e.g. when the player goes out of range of WiFi. A play session is now terminated after a break in connection lasting more than approximately one minute. Address the problem reported in Issue [#1584](https://github.com/mikebrady/shairport-sync/issues/1584). Thanks to [JanLp](https://github.com/JanLp) for the report. +* Use [TCP `keepalive`](https://en.wikipedia.org/wiki/Keepalive) to close down a play session when the client disappears, e.g. when the player goes out of range of WiFi. A play session is now terminated after a break in connection lasting more than approximately one minute. Addresses the problem reported in Issue [#1584](https://github.com/mikebrady/shairport-sync/issues/1584). Thanks to [JanLp](https://github.com/JanLp) for the report. Version 4.1-dev-809-g8a69f5ea ====