X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/5bac5b78c1046bd08a39d3d18c756bbf0566c629..19007e89957054b4af8667f85c0ec8d95f2001d6:/server/speaker.c?ds=sidebyside diff --git a/server/speaker.c b/server/speaker.c index b96fd5d..892e33c 100644 --- 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); - time(&last_report); + xtime(&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->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; } @@ -634,8 +636,9 @@ static void mainloop(void) { * 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. * @@ -681,7 +684,7 @@ static void mainloop(void) { } } /* If we've not reported our state for a second do so now. */ - if(force_report || time(0) > last_report) + if(force_report || xtime(0) > last_report) report(); } }