From e227596c2052f28956d1767c5562d2c5a133049d Mon Sep 17 00:00:00 2001 From: Max Kellermann Date: Mon, 8 Mar 2021 16:36:52 +0100 Subject: [PATCH] test/run_output: pass FileDescriptor to run_output() --- test/run_output.cxx | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/test/run_output.cxx b/test/run_output.cxx index bb7ba71b8..f7d86a825 100644 --- a/test/run_output.cxx +++ b/test/run_output.cxx @@ -113,7 +113,8 @@ LoadAudioOutput(const ConfigData &config, EventLoop &event_loop, } static void -run_output(AudioOutput &ao, AudioFormat audio_format) +RunOutput(AudioOutput &ao, AudioFormat audio_format, + FileDescriptor in_fd) { /* open the audio output */ @@ -134,8 +135,8 @@ run_output(AudioOutput &ao, AudioFormat audio_format) char buffer[4096]; while (true) { if (length < sizeof(buffer)) { - ssize_t nbytes = read(0, buffer + length, - sizeof(buffer) - length); + ssize_t nbytes = in_fd.Read(buffer + length, + sizeof(buffer) - length); if (nbytes <= 0) break; @@ -174,7 +175,7 @@ try { /* do it */ - run_output(*ao, c.audio_format); + RunOutput(*ao, c.audio_format, FileDescriptor(STDIN_FILENO)); /* cleanup and exit */