projects / newlib-cygwin.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: c750a72)
Cygwin: dsp: Fix SNDCTL_DSP_GET[IO]SPACE before read()/write().
authorTakashi Yano <takashi.yano@nifty.ne.jp>
Tue, 14 Feb 2023 13:55:10 +0000 (22:55 +0900)
committerTakashi Yano <takashi.yano@nifty.ne.jp>
Thu, 16 Feb 2023 11:14:13 +0000 (20:14 +0900)
Even with the commit 3a4c740f59c0, SNDCTL_DSP_GET[IO]SPACE ioctl()
does not return the fragment set by SNDCTL_DSP_SETFRAGMENT if it
is issued before read()/write(). This patch fixes the issue.

Fixes: 3a4c740f59c0 ("Cygwin: dsp: Implement SNDCTL_DSP_SETFRAGMENT ioctl().")
Signed-off-by: Takashi Yano <takashi.yano@nifty.ne.jp>
winsup/cygwin/fhandler/dsp.cc patch | blob | history

diff --git a/winsup/cygwin/fhandler/dsp.cc b/winsup/cygwin/fhandler/dsp.cc
index dd1aac8e26abb46b001e9aa2b450dc24663f98c6..16db6bb29cde653bc5082890a4d205b86d9cf101 100644 (file)
--- a/winsup/cygwin/fhandler/dsp.cc
+++ b/winsup/cygwin/fhandler/dsp.cc
@@ -1369,11 +1369,17 @@ fhandler_dev_dsp::_ioctl (unsigned int cmd, void *buf)
            return -1;
          }
        audio_buf_info *p = (audio_buf_info *) buf;
-        if (audio_out_) {
-            audio_out_->buf_info (p, audiofreq_, audiobits_, audiochannels_);
-        } else {
-            Audio_out::default_buf_info(p, audiofreq_, audiobits_, audiochannels_);
-        }
+       if (audio_out_)
+         audio_out_->buf_info (p, audiofreq_, audiobits_, audiochannels_);
+       else if (fragment_has_been_set)
+         {
+           p->bytes = fragsize_ * fragstotal_;
+           p->fragsize = fragsize_;
+           p->fragstotal = fragstotal_;
+           p->fragments = fragstotal_;
+         }
+       else
+         Audio_out::default_buf_info(p, audiofreq_, audiobits_, audiochannels_);
         debug_printf ("buf=%p frags=%d fragsize=%d bytes=%d",
                       buf, p->fragments, p->fragsize, p->bytes);
        return 0;
@@ -1387,11 +1393,17 @@ fhandler_dev_dsp::_ioctl (unsigned int cmd, void *buf)
            return -1;
          }
        audio_buf_info *p = (audio_buf_info *) buf;
-        if (audio_in_) {
-            audio_in_->buf_info (p, audiofreq_, audiobits_, audiochannels_);
-        } else {
-            Audio_in::default_buf_info(p, audiofreq_, audiobits_, audiochannels_);
-        }
+       if (audio_in_)
+         audio_in_->buf_info (p, audiofreq_, audiobits_, audiochannels_);
+       else if (fragment_has_been_set)
+         {
+           p->bytes = 0;
+           p->fragsize = fragsize_;
+           p->fragstotal = fragstotal_;
+           p->fragments = 0;
+         }
+       else
+         Audio_in::default_buf_info(p, audiofreq_, audiobits_, audiochannels_);
         debug_printf ("buf=%p frags=%d fragsize=%d bytes=%d",
                       buf, p->fragments, p->fragsize, p->bytes);
        return 0;
newlib and cygwin
This page took 0.060694 seconds and 5 git commands to generate.