chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Abolish uaudio_apis[]. Instead, define UAUDIO_DEFAULT to indicate
[disorder]
/
server
/
speaker-network.c
diff --git
a/server/speaker-network.c
b/server/speaker-network.c
index 409cbea0d3a9814040d2d52833087c6ccbafaa72..e8a7190413dc914f90fabaf6ceb64c590375518c 100644
(file)
--- a/
server/speaker-network.c
+++ b/
server/speaker-network.c
@@
-202,7
+202,7
@@
static size_t network_play(size_t frames) {
/* Find the number of microseconds elapsed since rtp_time=0 */
delta = tvsub_us(now, rtp_time_0);
if(delta > UINT64_MAX / 88200)
/* Find the number of microseconds elapsed since rtp_time=0 */
delta = tvsub_us(now, rtp_time_0);
if(delta > UINT64_MAX / 88200)
- fatal(0, "rtp_time=%
llu now=%ld.%06ld rtp_time_0=%ld.%06ld delta=%llu (%lld
)",
+ fatal(0, "rtp_time=%
"PRIu64" now=%ld.%06ld rtp_time_0=%ld.%06ld delta=%"PRIu64" (%"PRId64"
)",
rtp_time,
(long)now.tv_sec, (long)now.tv_usec,
(long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
rtp_time,
(long)now.tv_sec, (long)now.tv_usec,
(long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
@@
-302,7
+302,7
@@
static void network_beforepoll(int *timeoutp) {
xgettimeofday(&now, 0);
target_us = tvsub_us(now, rtp_time_0);
if(target_us > UINT64_MAX / 88200)
xgettimeofday(&now, 0);
target_us = tvsub_us(now, rtp_time_0);
if(target_us > UINT64_MAX / 88200)
- fatal(0, "rtp_time=%
llu rtp_time_0=%ld.%06ld now=%ld.%06ld target_us=%llu (%lld
)\n",
+ fatal(0, "rtp_time=%
"PRIu64" rtp_time_0=%ld.%06ld now=%ld.%06ld target_us=%"PRIu64" (%"PRId64"
)\n",
rtp_time,
(long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
(long)now.tv_sec, (long)now.tv_usec,
rtp_time,
(long)rtp_time_0.tv_sec, (long)rtp_time_0.tv_usec,
(long)now.tv_sec, (long)now.tv_usec,