Skip to content

Commit 9d10249

Browse files
committed
Update help information about password and stuffing modes. Quieten some debug messages.
1 parent 2028639 commit 9d10249

2 files changed

Lines changed: 8 additions & 7 deletions

File tree

rtsp.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1692,10 +1692,10 @@ void handle_pair_pin_start(rtsp_conn_info *conn, rtsp_message *req, rtsp_message
16921692
free(conn->ap2_client_name);
16931693
conn->ap2_client_name = strdup(hdr);
16941694
}
1695-
debug(1, "Connection %d from \"%s\": handle_pair_pin_start, Content-Length %d", conn->connection_number,
1695+
debug(4, "Connection %d from \"%s\": handle_pair_pin_start, Content-Length %d", conn->connection_number,
16961696
conn->ap2_client_name,
16971697
req->contentlength);
1698-
debug_log_rtsp_message_conn(conn, 1, "handle_pair_pin_start", req);
1698+
debug_log_rtsp_message_conn(conn, 4, "handle_pair_pin_start", req);
16991699

17001700
uint8_t *body = NULL;
17011701
size_t body_len = 0;
@@ -1704,7 +1704,7 @@ void handle_pair_pin_start(rtsp_conn_info *conn, rtsp_message *req, rtsp_message
17041704
resp->contentlength = body_len;
17051705
if (body != NULL)
17061706
msg_add_header(resp, "Content-Type", "application/octet-stream");
1707-
debug_log_rtsp_message(1, "pair-pin-start response", resp);
1707+
debug_log_rtsp_message(4, "pair-pin-start response", resp);
17081708
}
17091709

17101710
void handle_pair_setup(rtsp_conn_info *conn, rtsp_message *req, rtsp_message *resp) {

shairport.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -326,14 +326,15 @@ void usage(char *progname) {
326326
printf(" -v, --verbose Print debug information; -v some; -vv more; -vvv lots -- generally too much.\n");
327327
printf(" -c, --configfile=FILE Read configuration settings from FILE. Default is %s.\n", configuration_file_path);
328328
printf(" -a, --name=NAME Set service name. Default is the hostname with first letter capitalised.\n");
329-
printf(" --password=PASSWORD Require PASSWORD to connect. Default is no password. (Classic AirPlay only.)\n");
329+
printf(" --password=PASSWORD Require PASSWORD to connect. Default is no password.\n");
330330
printf(" -p, --port=PORT Set RTSP listening port. Default 5000; 7000 for AirPlay 2.\n");
331331
printf(" -L, --latency=FRAMES [Deprecated] Set the latency for audio sent from an unknown device.\n");
332332
printf(" The default is to set it automatically.\n");
333333
printf(" -S, --stuffing=MODE Set how to adjust current latency to match desired latency, where:\n");
334-
printf(" \"basic\" inserts or deletes audio frames from packet frames with low processor overhead, and\n");
335-
printf(" \"soxr\" uses libsoxr to minimally resample packet frames -- moderate processor overhead.\n");
336-
printf(" The default \"auto\" setting chooses basic or soxr depending on processor capability.\n");
334+
printf(" \"vernier\" recodes a packet of frames to a new packet containing more or fewer frames. Recommended for low powered devices;\n");
335+
printf(" \"basic\" inserts or deletes audio frames from packet frames with low processor overhead; and\n");
336+
printf(" \"soxr\" uses libsoxr to minimally resample packet frames -- moderate floating point processor overhead.\n");
337+
printf(" The default \"auto\" setting chooses vernier or soxr depending on processor capability.\n");
337338
printf(" The \"soxr\" option is only available if built with soxr support.\n");
338339
printf(" -B, --on-start=PROGRAM Run PROGRAM when playback is about to begin.\n");
339340
printf(" -E, --on-stop=PROGRAM Run PROGRAM when playback has ended.\n");

0 commit comments

Comments
 (0)