no need to patch away SNDCTL_DSP_GETODELAY now that it is in libossaudio

This commit is contained in:
jakemsr 2007-11-18 14:03:32 +00:00
parent ff78321453
commit 1d3b668b1a
2 changed files with 3 additions and 18 deletions

View File

@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2007/11/01 03:29:53 jakemsr Exp $
# $OpenBSD: Makefile,v 1.3 2007/11/18 14:03:32 jakemsr Exp $
COMMENT= portable cross-platform audio API
DISTNAME= portaudio-svn-1286
PKGNAME= ${DISTNAME}p0
PKGNAME= ${DISTNAME}p1
SHARED_LIBS= portaudio 0.0

View File

@ -1,4 +1,4 @@
$OpenBSD: patch-src_hostapi_oss_pa_unix_oss_c,v 1.2 2007/11/01 03:29:54 jakemsr Exp $
$OpenBSD: patch-src_hostapi_oss_pa_unix_oss_c,v 1.3 2007/11/18 14:03:32 jakemsr Exp $
--- src/hostapi/oss/pa_unix_oss.c.orig Sat Sep 29 19:11:09 2007
+++ src/hostapi/oss/pa_unix_oss.c Sun Oct 28 17:05:10 2007
@@ -72,6 +72,9 @@
@ -124,18 +124,3 @@ $OpenBSD: patch-src_hostapi_oss_pa_unix_oss_c,v 1.2 2007/11/01 03:29:54 jakemsr
/* allocate and do basic initialization of the stream structure */
PA_UNLESS( stream = (PaOssStream*)PaUtil_AllocateMemory( sizeof(PaOssStream) ), paInsufficientMemory );
@@ -1942,11 +1993,11 @@ static signed long GetStreamReadAvailable( PaStream* s
static signed long GetStreamWriteAvailable( PaStream* s )
{
PaOssStream *stream = (PaOssStream*)s;
- int delay = 0;
+ struct count_info delay;
- if( ioctl( stream->playback->fd, SNDCTL_DSP_GETODELAY, &delay ) < 0 )
+ if( ioctl( stream->playback->fd, SNDCTL_DSP_GETOPTR, &delay ) < 0 )
return paUnanticipatedHostError;
- return (PaOssStreamComponent_BufferSize( stream->playback ) - delay) / PaOssStreamComponent_FrameSize( stream->playback );
+ return (PaOssStreamComponent_BufferSize( stream->playback ) - delay.ptr) / PaOssStreamComponent_FrameSize( stream->playback );
}