~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix the build fix. It turns out that Uint32 != uint32_t.
[disorder]
/
server
/
speaker.c
diff --git
a/server/speaker.c
b/server/speaker.c
index
b96fd5d
..
892e33c
100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-370,7
+370,7
@@
static void report(void) {
strcpy(sm.id, playing->id);
sm.data = playing->played / (uaudio_rate * uaudio_channels);
speaker_send(1, &sm);
strcpy(sm.id, playing->id);
sm.data = playing->played / (uaudio_rate * uaudio_channels);
speaker_send(1, &sm);
- time(&last_report);
+
x
time(&last_report);
}
}
}
}
@@
-426,8
+426,10
@@
static size_t speaker_callback(void *buffer,
if(playing->start == sizeof playing->buffer)
playing->start = 0;
/* See if we've reached the end of the track */
if(playing->start == sizeof playing->buffer)
playing->start = 0;
/* See if we've reached the end of the track */
- if(playing->used == 0 && playing->eof)
- write(sigpipe[1], "", 1);
+ if(playing->used == 0 && playing->eof) {
+ int ignored = write(sigpipe[1], "", 1);
+ (void) ignored;
+ }
provided_samples = bytes / uaudio_sample_size;
playing->played += provided_samples;
}
provided_samples = bytes / uaudio_sample_size;
playing->played += provided_samples;
}
@@
-634,8
+636,9
@@
static void mainloop(void) {
* interrupted poll(). */
if(fds[sigpipe_slot].revents & POLLIN) {
char buffer[64];
* interrupted poll(). */
if(fds[sigpipe_slot].revents & POLLIN) {
char buffer[64];
+ int ignored; (void)ignored;
- read(sigpipe[0], buffer, sizeof buffer);
+
ignored =
read(sigpipe[0], buffer, sizeof buffer);
}
/* Send SM_FINISHED when we're near the end of the track.
*
}
/* Send SM_FINISHED when we're near the end of the track.
*
@@
-681,7
+684,7
@@
static void mainloop(void) {
}
}
/* If we've not reported our state for a second do so now. */
}
}
/* If we've not reported our state for a second do so now. */
- if(force_report || time(0) > last_report)
+ if(force_report ||
x
time(0) > last_report)
report();
}
}
report();
}
}