chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
clients/playrtp.c: Insert a paragraph heading to break the monotony.
[disorder]
/
clients
/
playrtp.c
diff --git
a/clients/playrtp.c
b/clients/playrtp.c
index f6e89d24391a95617bc056445c3ed1ce383a705b..b5da73fdbe500695fafd686331a96e53892ae709 100644
(file)
--- a/
clients/playrtp.c
+++ b/
clients/playrtp.c
@@
-500,7
+500,7
@@
struct packet *playrtp_next_packet(void) {
}
/* display usage message and terminate */
}
/* display usage message and terminate */
-static void help(void) {
+static void
attribute((noreturn))
help(void) {
xprintf("Usage:\n"
" disorder-playrtp [OPTIONS] [[ADDRESS] PORT]\n"
"Options:\n"
xprintf("Usage:\n"
" disorder-playrtp [OPTIONS] [[ADDRESS] PORT]\n"
"Options:\n"
@@
-754,6
+754,7
@@
int main(int argc, char **argv) {
}
}
if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
}
}
if(config_read(0, NULL)) disorder_fatal(0, "cannot read configuration");
+ /* Choose a sensible default audio backend */
if(!backend) {
backend = uaudio_default(uaudio_apis, UAUDIO_API_CLIENT);
if(!backend)
if(!backend) {
backend = uaudio_default(uaudio_apis, UAUDIO_API_CLIENT);
if(!backend)
@@
-795,6
+796,12
@@
int main(int argc, char **argv) {
struct sockaddr *addr;
socklen_t addr_len;
if(!strcmp(sl.s[0], "-")) {
struct sockaddr *addr;
socklen_t addr_len;
if(!strcmp(sl.s[0], "-")) {
+ /* We'll need a connection to request the incoming stream, so open one if
+ * we don't have one already */
+ if(!c) {
+ if(!(c = disorder_new(1))) exit(EXIT_FAILURE);
+ if(disorder_connect(c)) exit(EXIT_FAILURE);
+ }
/* Pick address family to match known-working connectivity to the server */
int family = disorder_client_af(c);
/* Get a list of interfaces */
/* Pick address family to match known-working connectivity to the server */
int family = disorder_client_af(c);
/* Get a list of interfaces */
@@
-803,6
+810,7
@@
int main(int argc, char **argv) {
disorder_fatal(errno, "error calling getifaddrs");
/* Try to pick a good one */
for(; ifa; ifa = ifa->ifa_next) {
disorder_fatal(errno, "error calling getifaddrs");
/* Try to pick a good one */
for(; ifa; ifa = ifa->ifa_next) {
+ if(!ifa->ifa_addr) continue;
if(bestifa == NULL
|| compare_interfaces(ifa, bestifa, family) > 0)
bestifa = ifa;
if(bestifa == NULL
|| compare_interfaces(ifa, bestifa, family) > 0)
bestifa = ifa;