From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7868) id 864EA3857C45; Sat, 25 Feb 2023 08:59:33 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 864EA3857C45 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1677315573; bh=X1uwWIpakxdOKVjeiPc0Vy+fuw5Oc54yrqkbVqiF/g4=; h=From:To:Subject:Date:From; b=xNx/CjY+WkRZpeggn/gACIRFntxLqtDQ3ASB5sQUFyTVLPMhV5pOj3YYZcsLNvMXN uQCheOYjp/i3VQd0ynWyoMcgBgPbO/a8sZyAfARYsAk9oV3c37fOboOp+WkETT/jM2 rjEe9YvD8n4ivMh5v024EIXCVzGV9EKnXlAHCHTI= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Takashi Yano To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin/cygwin-3_4-branch] Cygwin: dsp: Fix SNDCTL_DSP_{POST,SYNC} ioctl() behaviour. X-Act-Checkin: newlib-cygwin X-Git-Author: Takashi Yano X-Git-Refname: refs/heads/cygwin-3_4-branch X-Git-Oldrev: 2fd459c3b180def80b0db4b6c91e4f088e779cc1 X-Git-Newrev: 77f324ae03547c82b724ef5a35bd72b2ecf09e61 Message-Id: <20230225085933.864EA3857C45@sourceware.org> Date: Sat, 25 Feb 2023 08:59:33 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D77f324ae035= 47c82b724ef5a35bd72b2ecf09e61 commit 77f324ae03547c82b724ef5a35bd72b2ecf09e61 Author: Takashi Yano Date: Sat Feb 25 10:28:34 2023 +0900 Cygwin: dsp: Fix SNDCTL_DSP_{POST,SYNC} ioctl() behaviour. =20 Previously, SNDCTL_DSP_POST and SNDCTL_DSP_SYNC were implemented wrongly. Due to this issue, module-oss of pulseaudio generates choppy sound when SNDCTL_DSP_POST is called. This patch fixes that. =20 Signed-off-by: Takashi Yano Diff: --- winsup/cygwin/fhandler/dsp.cc | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/winsup/cygwin/fhandler/dsp.cc b/winsup/cygwin/fhandler/dsp.cc index cfbf6bec7..db7b2550e 100644 --- a/winsup/cygwin/fhandler/dsp.cc +++ b/winsup/cygwin/fhandler/dsp.cc @@ -133,6 +133,8 @@ class fhandler_dev_dsp::Audio_out: public Audio int freq_; int bits_; int channels_; + + friend fhandler_dev_dsp; }; =20 static void CALLBACK waveIn_callback (HWAVEIN hWave, UINT msg, @@ -1417,11 +1419,16 @@ fhandler_dev_dsp::_ioctl (unsigned int cmd, void *b= uf) return 0; =20 CASE (SNDCTL_DSP_POST) + if (audio_out_) + audio_out_->sendcurrent (); // force out last block whatever size.. + return 0; + CASE (SNDCTL_DSP_SYNC) - // Stop audio out device - close_audio_out (); - // Stop audio in device - close_audio_in (); + if (audio_out_) + { + audio_out_->sendcurrent (); // force out last block whatever size.. + audio_out_->waitforallsent (); // block till finished.. + } return 0; =20 default: