diff options
| author | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-02-25 07:51:00 +0000 |
| commit | dca37d126746d995167a31f58d3a395ae162f5d4 (patch) | |
| tree | 6f5a0e00be9e5f70d6bc341d4abdb1f14c8f79a2 /xorg-server/hw/xfree86/os-support/solaris/sun_bell.c | |
| parent | 23fda7c555e6c749b1d9727be5e5571a0559b9b3 (diff) | |
| parent | 24bc15a386e37908396c3f6088f6fc98ceaa0f46 (diff) | |
| download | vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.gz vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.tar.bz2 vcxsrv-dca37d126746d995167a31f58d3a395ae162f5d4.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/hw/xfree86/os-support/solaris/sun_bell.c')
| -rw-r--r-- | xorg-server/hw/xfree86/os-support/solaris/sun_bell.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c index 7f146eaaf..05d17492a 100644 --- a/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c +++ b/xorg-server/hw/xfree86/os-support/solaris/sun_bell.c @@ -126,14 +126,15 @@ xf86OSRingBell(int loudness, int pitch, int duration) iovcnt = 0; for (cnt = 0; cnt <= repeats; cnt++) { - iov[iovcnt].iov_base = (char *) samples; - iov[iovcnt++].iov_len = sizeof(samples); if (cnt == repeats) { /* Insert a bit of silence so that multiple beeps are distinct and * not compressed into a single tone. */ iov[iovcnt].iov_base = (char *) silence; iov[iovcnt++].iov_len = sizeof(silence); + } else { + iov[iovcnt].iov_base = (char *) samples; + iov[iovcnt++].iov_len = sizeof(samples); } if ((iovcnt >= IOV_MAX) || (cnt == repeats)) { written = writev(audioFD, iov, iovcnt); |