Skip to content

Commit

Permalink
Add man page to Docker images, add extra decoding to MQTT.
Browse files Browse the repository at this point in the history
  • Loading branch information
mikebrady committed Dec 5, 2022
2 parents acdae45 + a649a8c commit eb4bdd9
Show file tree
Hide file tree
Showing 4 changed files with 19 additions and 4 deletions.
7 changes: 6 additions & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
8 changes: 6 additions & 2 deletions docker/classic/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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/
Expand Down
6 changes: 6 additions & 0 deletions mqtt.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion player.c
Original file line number Diff line number Diff line change
Expand Up @@ -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 =
Expand Down

0 comments on commit eb4bdd9

Please sign in to comment.