- update to rev 1406
- add sndio backend written by ratchov@ - disable OSS backend
This commit is contained in:
jakemsr
parent
7f381452e1
commit
53232a9ea5
@ -1,7 +1,7 @@
|
||||
# $OpenBSD: Makefile,v 1.5 2008/04/02 06:46:03 jakemsr Exp $
|
||||
# $OpenBSD: Makefile,v 1.6 2009/03/14 02:31:40 jakemsr Exp $
|
||||
|
||||
COMMENT= portable cross-platform audio API
|
||||
DISTNAME= portaudio-svn-1360
|
||||
DISTNAME= portaudio-svn-1406
|
||||
|
||||
SHARED_LIBS= portaudio 0.0
|
||||
|
||||
@ -15,7 +15,7 @@ PERMIT_PACKAGE_FTP= Yes
|
||||
PERMIT_DISTFILES_CDROM= Yes
|
||||
PERMIT_DISTFILES_FTP= Yes
|
||||
|
||||
WANTLIB= m ossaudio
|
||||
WANTLIB= m sndio
|
||||
|
||||
MASTER_SITES= http://jakemsr.trancell.org/distfiles/
|
||||
|
||||
@ -23,8 +23,9 @@ LIB_DEPENDS= jack::audio/jack
|
||||
|
||||
USE_GMAKE= Yes
|
||||
USE_LIBTOOL= Yes
|
||||
CONFIGURE_STYLE= gnu
|
||||
CONFIGURE_ARGS= --without-alsa
|
||||
AUTOCONF_VERSION= 2.61
|
||||
CONFIGURE_STYLE= autoconf no-autoheader
|
||||
CONFIGURE_ARGS= --without-alsa --without-oss
|
||||
|
||||
# builds non-automated, interactive tests in ${WRKBUILD}/bin
|
||||
REGRESS_TARGET= tests
|
||||
@ -32,4 +33,8 @@ REGRESS_IS_INTERACTIVE= Yes
|
||||
|
||||
CFLAGS+= -DALLOW_SMP_DANGERS
|
||||
|
||||
post-extract:
|
||||
@mkdir -p ${WRKSRC}/src/hostapi/sndio
|
||||
@cp ${FILESDIR}/pa_sndio.c ${WRKSRC}/src/hostapi/sndio
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,5 +1,5 @@
|
||||
MD5 (portaudio-svn-1360.tar.gz) = UrXypSJDDqN+mc/dqgMsIQ==
|
||||
RMD160 (portaudio-svn-1360.tar.gz) = DsgVIeXEaYRScud2lzRzaBaBgZs=
|
||||
SHA1 (portaudio-svn-1360.tar.gz) = 68wwWFgC59+G6w/P1ReVmTN9IKE=
|
||||
SHA256 (portaudio-svn-1360.tar.gz) = +M+fMzxuhsvv0xaqRw5W+BAlKf8asWJoI26DuJR4zSo=
|
||||
SIZE (portaudio-svn-1360.tar.gz) = 1118279
|
||||
MD5 (portaudio-svn-1406.tar.gz) = RlHa1Y+Gn5EgX5e3aMqyTw==
|
||||
RMD160 (portaudio-svn-1406.tar.gz) = XulIpuTPeK87JCDgXcimf4E2BFo=
|
||||
SHA1 (portaudio-svn-1406.tar.gz) = fIvJxOhzOJ1qs4hdYBkWYniLhlg=
|
||||
SHA256 (portaudio-svn-1406.tar.gz) = DT3QREhDCriP1SAK13kb9EH5z5rkNf1XI4LCtuF3UrU=
|
||||
SIZE (portaudio-svn-1406.tar.gz) = 1132199
|
||||
|
||||
795
audio/portaudio-svn/files/pa_sndio.c
Normal file
795
audio/portaudio-svn/files/pa_sndio.c
Normal file
@ -0,0 +1,795 @@
|
||||
/*
|
||||
* Copyright (c) 2009 Alexandre Ratchov <alex@caoua.org>
|
||||
*
|
||||
* Permission to use, copy, modify, and distribute this software for any
|
||||
* purpose with or without fee is hereby granted, provided that the above
|
||||
* copyright notice and this permission notice appear in all copies.
|
||||
*
|
||||
* THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
* WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
* MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
* ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
* WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
#include <sys/types.h>
|
||||
#include <pthread.h>
|
||||
#include <poll.h>
|
||||
#include <errno.h>
|
||||
#include <string.h>
|
||||
#include <stdlib.h>
|
||||
#include <stdio.h>
|
||||
#include <sndio.h>
|
||||
|
||||
#include "pa_util.h"
|
||||
#include "pa_hostapi.h"
|
||||
#include "pa_stream.h"
|
||||
#include "pa_process.h"
|
||||
#include "pa_allocation.h"
|
||||
|
||||
#if 0
|
||||
#define DPR(...) do { fprintf(stderr, __VA_ARGS__); } while (0)
|
||||
#else
|
||||
#define DPR(...) do {} while (0)
|
||||
#endif
|
||||
|
||||
/*
|
||||
* per-stream data
|
||||
*/
|
||||
typedef struct PaSndioStream
|
||||
{
|
||||
PaUtilStreamRepresentation base;
|
||||
PaUtilBufferProcessor bufproc; /* format conversion */
|
||||
struct sio_hdl *hdl; /* handle for device i/o */
|
||||
struct sio_par par; /* current device parameters */
|
||||
unsigned mode; /* SIO_PLAY, SIO_REC or both */
|
||||
int stopped; /* stop requested or not started */
|
||||
int active; /* thread is running */
|
||||
unsigned long long realpos; /* frame number h/w is processing */
|
||||
char *rbuf, *wbuf; /* bounce buffers for conversions */
|
||||
unsigned long long rpos, wpos; /* bytes read/written */
|
||||
pthread_t thread; /* thread of the callback interface */
|
||||
} PaSndioStream;
|
||||
|
||||
/*
|
||||
* api "class" data, common to all streams
|
||||
*/
|
||||
typedef struct PaSndioHostApiRepresentation
|
||||
{
|
||||
PaUtilHostApiRepresentation base;
|
||||
PaUtilStreamInterface callback;
|
||||
PaUtilStreamInterface blocking;
|
||||
/*
|
||||
* libsndio has no device discovery mechanism, so expose only
|
||||
* the default device, the user will have a chance to change it
|
||||
* using the environment variable
|
||||
*/
|
||||
PaDeviceInfo *infos[1], default_info;
|
||||
struct sio_cap *caps[1], default_cap;
|
||||
} PaSndioHostApiRepresentation;
|
||||
|
||||
/*
|
||||
* callback invoked when blocks are processed by the hardware
|
||||
*/
|
||||
static void
|
||||
sndioOnMove(void *addr, int delta)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)addr;
|
||||
|
||||
s->realpos += delta;
|
||||
}
|
||||
|
||||
/*
|
||||
* convert PA encoding to libsndio encoding, retrun true on success
|
||||
*/
|
||||
static int
|
||||
sndioSetFmt(struct sio_par *sio, PaSampleFormat fmt)
|
||||
{
|
||||
switch (fmt & ~paNonInterleaved) {
|
||||
case paInt32:
|
||||
sio->sig = 1;
|
||||
sio->bits = 32;
|
||||
break;
|
||||
case paInt24:
|
||||
sio->sig = 1;
|
||||
sio->bits = 24;
|
||||
sio->bps = 3; /* paInt24 is packed format */
|
||||
break;
|
||||
case paInt16:
|
||||
case paFloat32:
|
||||
sio->sig = 1;
|
||||
sio->bits = 16;
|
||||
break;
|
||||
case paInt8:
|
||||
sio->sig = 1;
|
||||
sio->bits = 8;
|
||||
break;
|
||||
case paUInt8:
|
||||
sio->sig = 0;
|
||||
sio->bits = 8;
|
||||
break;
|
||||
default:
|
||||
DPR("sndioSetFmt: %x: unsupported\n", fmt);
|
||||
return 0;
|
||||
}
|
||||
sio->le = SIO_LE_NATIVE;
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* convert libsndio encoding to PA encoding, retrun true on success
|
||||
*/
|
||||
static int
|
||||
sndioGetFmt(struct sio_par *sio, PaSampleFormat *fmt)
|
||||
{
|
||||
if ((sio->bps * 8 != sio->bits && !sio->msb) ||
|
||||
(sio->bps > 1 && sio->le != SIO_LE_NATIVE)) {
|
||||
DPR("sndioGetFmt: bits = %u, le = %u, msb = %u, bps = %u\n",
|
||||
sio->bits, sio->le, sio->msb, sio->bps);
|
||||
return 0;
|
||||
}
|
||||
|
||||
switch (sio->bits) {
|
||||
case 32:
|
||||
if (!sio->sig)
|
||||
return 0;
|
||||
*fmt = paInt32;
|
||||
break;
|
||||
case 24:
|
||||
if (!sio->sig)
|
||||
return 0;
|
||||
*fmt = paInt24;
|
||||
break;
|
||||
case 16:
|
||||
if (!sio->sig)
|
||||
return 0;
|
||||
*fmt = paInt16;
|
||||
break;
|
||||
case 8:
|
||||
*fmt = sio->sig ? paInt8 : paUInt8;
|
||||
break;
|
||||
default:
|
||||
DPR("sndioGetFmt: %u: unsupported\n", sio->bits);
|
||||
return 0;
|
||||
}
|
||||
return 1;
|
||||
}
|
||||
|
||||
/*
|
||||
* I/O loop for callback interface
|
||||
*/
|
||||
static void *
|
||||
sndioThread(void *arg)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)arg;
|
||||
PaStreamCallbackTimeInfo ti;
|
||||
unsigned char *data;
|
||||
unsigned todo, rblksz, wblksz;
|
||||
int n, result;
|
||||
|
||||
rblksz = s->par.round * s->par.rchan * s->par.bps;
|
||||
wblksz = s->par.round * s->par.pchan * s->par.bps;
|
||||
|
||||
DPR("sndioThread: mode = %x, round = %u, rblksz = %u, wblksz = %u\n",
|
||||
s->mode, s->par.round, rblksz, wblksz);
|
||||
|
||||
while (!s->stopped) {
|
||||
if (s->mode & SIO_REC) {
|
||||
todo = rblksz;
|
||||
data = s->rbuf;
|
||||
while (todo > 0) {
|
||||
n = sio_read(s->hdl, data, todo);
|
||||
if (n == 0) {
|
||||
DPR("sndioThread: sio_read failed\n");
|
||||
goto failed;
|
||||
}
|
||||
todo -= n;
|
||||
data += n;
|
||||
}
|
||||
s->rpos += s->par.round;
|
||||
ti.inputBufferAdcTime =
|
||||
(double)s->realpos / s->par.rate;
|
||||
}
|
||||
if (s->mode & SIO_PLAY) {
|
||||
ti.outputBufferDacTime =
|
||||
(double)(s->realpos + s->par.bufsz) / s->par.rate;
|
||||
}
|
||||
ti.currentTime = s->realpos / (double)s->par.rate;
|
||||
PaUtil_BeginBufferProcessing(&s->bufproc, &ti, 0);
|
||||
if (s->mode & SIO_PLAY) {
|
||||
PaUtil_SetOutputFrameCount(&s->bufproc, s->par.round);
|
||||
PaUtil_SetInterleavedOutputChannels(&s->bufproc,
|
||||
0, s->wbuf, s->par.pchan);
|
||||
}
|
||||
if (s->mode & SIO_REC) {
|
||||
PaUtil_SetInputFrameCount(&s->bufproc, s->par.round);
|
||||
PaUtil_SetInterleavedInputChannels(&s->bufproc,
|
||||
0, s->rbuf, s->par.rchan);
|
||||
}
|
||||
result = paContinue;
|
||||
n = PaUtil_EndBufferProcessing(&s->bufproc, &result);
|
||||
if (n != s->par.round) {
|
||||
DPR("sndioThread: %d < %u frames, result = %d\n",
|
||||
n, s->par.round, result);
|
||||
}
|
||||
if (result != paContinue) {
|
||||
break;
|
||||
}
|
||||
if (s->mode & SIO_PLAY) {
|
||||
n = sio_write(s->hdl, s->wbuf, wblksz);
|
||||
if (n < wblksz) {
|
||||
DPR("sndioThread: sio_write failed\n");
|
||||
goto failed;
|
||||
}
|
||||
s->wpos += s->par.round;
|
||||
}
|
||||
}
|
||||
failed:
|
||||
s->active = 0;
|
||||
DPR("sndioThread: done\n");
|
||||
}
|
||||
|
||||
static PaError
|
||||
OpenStream(struct PaUtilHostApiRepresentation *hostApi,
|
||||
PaStream **stream,
|
||||
const PaStreamParameters *inputPar,
|
||||
const PaStreamParameters *outputPar,
|
||||
double sampleRate,
|
||||
unsigned long framesPerBuffer,
|
||||
PaStreamFlags streamFlags,
|
||||
PaStreamCallback *streamCallback,
|
||||
void *userData)
|
||||
{
|
||||
PaSndioHostApiRepresentation *sndioHostApi = (PaSndioHostApiRepresentation *)hostApi;
|
||||
PaSndioStream *s;
|
||||
PaError err;
|
||||
struct sio_hdl *hdl;
|
||||
struct sio_par par;
|
||||
unsigned mode;
|
||||
int inch, onch;
|
||||
PaSampleFormat ifmt, ofmt, siofmt;
|
||||
|
||||
DPR("OpenStream:\n");
|
||||
|
||||
mode = 0;
|
||||
inch = onch = 0;
|
||||
ifmt = ofmt = 0;
|
||||
sio_initpar(&par);
|
||||
|
||||
if (outputPar && outputPar->channelCount > 0) {
|
||||
if (outputPar->device != 0) {
|
||||
DPR("OpenStream: %d: bad output device\n", outputPar->device);
|
||||
return paInvalidDevice;
|
||||
}
|
||||
if (outputPar->hostApiSpecificStreamInfo) {
|
||||
DPR("OpenStream: output specific info\n");
|
||||
return paIncompatibleHostApiSpecificStreamInfo;
|
||||
}
|
||||
if (!sndioSetFmt(&par, outputPar->sampleFormat)) {
|
||||
return paSampleFormatNotSupported;
|
||||
}
|
||||
ofmt = outputPar->sampleFormat;
|
||||
onch = par.pchan = outputPar->channelCount;
|
||||
mode |= SIO_PLAY;
|
||||
}
|
||||
if (inputPar && inputPar->channelCount > 0) {
|
||||
if (inputPar->device != 0) {
|
||||
DPR("OpenStream: %d: bad input device\n", inputPar->device);
|
||||
return paInvalidDevice;
|
||||
}
|
||||
if (inputPar->hostApiSpecificStreamInfo) {
|
||||
DPR("OpenStream: input specific info\n");
|
||||
return paIncompatibleHostApiSpecificStreamInfo;
|
||||
}
|
||||
if (!sndioSetFmt(&par, inputPar->sampleFormat)) {
|
||||
return paSampleFormatNotSupported;
|
||||
}
|
||||
ifmt = inputPar->sampleFormat;
|
||||
inch = par.rchan = inputPar->channelCount;
|
||||
mode |= SIO_REC;
|
||||
}
|
||||
par.rate = sampleRate;
|
||||
if (framesPerBuffer != paFramesPerBufferUnspecified)
|
||||
par.round = framesPerBuffer;
|
||||
|
||||
DPR("OpenStream: mode = %x, trying rate = %u\n", mode, par.rate);
|
||||
|
||||
hdl = sio_open(NULL, mode, 0);
|
||||
if (hdl == NULL)
|
||||
return paUnanticipatedHostError;
|
||||
if (!sio_setpar(hdl, &par)) {
|
||||
sio_close(hdl);
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
if (!sio_getpar(hdl, &par)) {
|
||||
sio_close(hdl);
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
if (!sndioGetFmt(&par, &siofmt)) {
|
||||
sio_close(hdl);
|
||||
return paSampleFormatNotSupported;
|
||||
}
|
||||
if ((mode & SIO_REC) && par.rchan != inputPar->channelCount) {
|
||||
DPR("OpenStream: rchan(%u) != %d\n", par.rchan, inputPar->channelCount);
|
||||
sio_close(hdl);
|
||||
return paInvalidChannelCount;
|
||||
}
|
||||
if ((mode & SIO_PLAY) && par.pchan != outputPar->channelCount) {
|
||||
DPR("OpenStream: pchan(%u) != %d\n", par.pchan, outputPar->channelCount);
|
||||
sio_close(hdl);
|
||||
return paInvalidChannelCount;
|
||||
}
|
||||
if ((double)par.rate < sampleRate * 0.995 ||
|
||||
(double)par.rate > sampleRate * 1.005) {
|
||||
DPR("OpenStream: rate(%u) != %g\n", par.rate, sampleRate);
|
||||
sio_close(hdl);
|
||||
return paInvalidSampleRate;
|
||||
}
|
||||
|
||||
s = (PaSndioStream *)PaUtil_AllocateMemory(sizeof(PaSndioStream));
|
||||
if (s == NULL) {
|
||||
sio_close(hdl);
|
||||
return paInsufficientMemory;
|
||||
}
|
||||
PaUtil_InitializeStreamRepresentation(&s->base,
|
||||
streamCallback ? &sndioHostApi->callback : &sndioHostApi->blocking,
|
||||
streamCallback, userData);
|
||||
DPR("inch = %d, onch = %d, ifmt = %x, ofmt = %x\n",
|
||||
inch, onch, ifmt, ofmt);
|
||||
err = PaUtil_InitializeBufferProcessor(&s->bufproc,
|
||||
inch, ifmt, siofmt,
|
||||
onch, ofmt, siofmt,
|
||||
sampleRate,
|
||||
streamFlags,
|
||||
framesPerBuffer,
|
||||
par.round,
|
||||
paUtilFixedHostBufferSize,
|
||||
streamCallback, userData);
|
||||
if (err) {
|
||||
DPR("OpenStream: PaUtil_InitializeBufferProcessor failed\n");
|
||||
PaUtil_FreeMemory(s);
|
||||
sio_close(hdl);
|
||||
return err;
|
||||
}
|
||||
if (mode & SIO_REC) {
|
||||
s->rbuf = malloc(par.round * par.rchan * par.bps);
|
||||
if (s->rbuf == NULL) {
|
||||
DPR("OpenStream: failed to allocate rbuf\n");
|
||||
PaUtil_FreeMemory(s);
|
||||
sio_close(hdl);
|
||||
return paInsufficientMemory;
|
||||
}
|
||||
}
|
||||
if (mode & SIO_PLAY) {
|
||||
s->wbuf = malloc(par.round * par.pchan * par.bps);
|
||||
if (s->wbuf == NULL) {
|
||||
DPR("OpenStream: failed to allocate wbuf\n");
|
||||
free(s->rbuf);
|
||||
PaUtil_FreeMemory(s);
|
||||
sio_close(hdl);
|
||||
return paInsufficientMemory;
|
||||
}
|
||||
}
|
||||
s->base.streamInfo.inputLatency = (mode & SIO_REC) ?
|
||||
(double)(par.bufsz + PaUtil_GetBufferProcessorInputLatency(&s->bufproc)) / (double)par.rate : 0;
|
||||
s->base.streamInfo.outputLatency = (mode & SIO_PLAY) ?
|
||||
(double)(par.bufsz + PaUtil_GetBufferProcessorOutputLatency(&s->bufproc)) / (double)par.rate : 0;
|
||||
s->base.streamInfo.sampleRate = par.rate;
|
||||
s->active = 0;
|
||||
s->stopped = 1;
|
||||
s->mode = mode;
|
||||
s->hdl = hdl;
|
||||
s->par = par;
|
||||
*stream = s;
|
||||
DPR("OpenStream: done\n");
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
BlockingReadStream(PaStream *stream, void *data, unsigned long numFrames)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
unsigned n, res, todo;
|
||||
void *buf;
|
||||
|
||||
while (numFrames > 0) {
|
||||
n = s->par.round;
|
||||
if (n > numFrames)
|
||||
n = numFrames;
|
||||
buf = s->rbuf;
|
||||
todo = n * s->par.rchan * s->par.bps;
|
||||
while (todo > 0) {
|
||||
res = sio_read(s->hdl, buf, todo);
|
||||
if (res == 0)
|
||||
return paUnanticipatedHostError;
|
||||
buf = (char *)buf + res;
|
||||
todo -= res;
|
||||
}
|
||||
s->rpos += n;
|
||||
PaUtil_SetInputFrameCount(&s->bufproc, n);
|
||||
PaUtil_SetInterleavedInputChannels(&s->bufproc, 0, s->rbuf, s->par.rchan);
|
||||
res = PaUtil_CopyInput(&s->bufproc, &data, n);
|
||||
if (res != n) {
|
||||
DPR("BlockingReadStream: copyInput: %u != %u\n");
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
numFrames -= n;
|
||||
}
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
BlockingWriteStream(PaStream* stream, const void *data, unsigned long numFrames)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
unsigned n, res;
|
||||
|
||||
while (numFrames > 0) {
|
||||
n = s->par.round;
|
||||
if (n > numFrames)
|
||||
n = numFrames;
|
||||
PaUtil_SetOutputFrameCount(&s->bufproc, n);
|
||||
PaUtil_SetInterleavedOutputChannels(&s->bufproc, 0, s->wbuf, s->par.pchan);
|
||||
res = PaUtil_CopyOutput(&s->bufproc, &data, n);
|
||||
if (res != n) {
|
||||
DPR("BlockingWriteStream: copyOutput: %u != %u\n");
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
res = sio_write(s->hdl, s->wbuf, n * s->par.pchan * s->par.bps);
|
||||
if (res == 0)
|
||||
return paUnanticipatedHostError;
|
||||
s->wpos += n;
|
||||
numFrames -= n;
|
||||
}
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static signed long
|
||||
BlockingGetStreamReadAvailable(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
struct pollfd pfd;
|
||||
int n, events;
|
||||
|
||||
n = sio_pollfd(s->hdl, &pfd, POLLIN);
|
||||
while (poll(&pfd, n, 0) < 0) {
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
perror("poll");
|
||||
abort();
|
||||
}
|
||||
events = sio_revents(s->hdl, &pfd);
|
||||
if (!(events & POLLIN))
|
||||
return 0;
|
||||
|
||||
return s->realpos - s->rpos;
|
||||
}
|
||||
|
||||
static signed long
|
||||
BlockingGetStreamWriteAvailable(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
struct pollfd pfd;
|
||||
int n, events;
|
||||
|
||||
n = sio_pollfd(s->hdl, &pfd, POLLOUT);
|
||||
while (poll(&pfd, n, 0) < 0) {
|
||||
if (errno == EINTR)
|
||||
continue;
|
||||
perror("poll");
|
||||
abort();
|
||||
}
|
||||
events = sio_revents(s->hdl, &pfd);
|
||||
if (!(events & POLLOUT))
|
||||
return 0;
|
||||
|
||||
return s->par.bufsz - (s->wpos - s->realpos);
|
||||
}
|
||||
|
||||
static PaError
|
||||
BlockingWaitEmpty( PaStream *stream )
|
||||
{
|
||||
/*
|
||||
* drain playback buffers; libsndio always does it in background
|
||||
* and there is no way to wait for completion
|
||||
*/
|
||||
DPR("BlockingWaitEmpty: s=%d, a=%d\n", s->stopped, s->active);
|
||||
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
StartStream(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
unsigned primes, wblksz;
|
||||
int err;
|
||||
|
||||
DPR("StartStream: s=%d, a=%d\n", s->stopped, s->active);
|
||||
|
||||
if (!s->stopped) {
|
||||
DPR("StartStream: already started\n");
|
||||
return paNoError;
|
||||
}
|
||||
s->stopped = 0;
|
||||
s->active = 1;
|
||||
s->realpos = 0;
|
||||
s->wpos = 0;
|
||||
s->rpos = 0;
|
||||
PaUtil_ResetBufferProcessor(&s->bufproc);
|
||||
if (!sio_start(s->hdl))
|
||||
return paUnanticipatedHostError;
|
||||
|
||||
/*
|
||||
* send a complete buffer of silence
|
||||
*/
|
||||
if (s->mode & SIO_PLAY) {
|
||||
wblksz = s->par.round * s->par.pchan * s->par.bps;
|
||||
memset(s->wbuf, 0, wblksz);
|
||||
for (primes = s->par.bufsz / s->par.round; primes > 0; primes--)
|
||||
s->wpos += sio_write(s->hdl, s->wbuf, wblksz);
|
||||
}
|
||||
if (s->base.streamCallback) {
|
||||
err = pthread_create(&s->thread, NULL, sndioThread, s);
|
||||
if (err) {
|
||||
DPR("SndioStartStream: couldn't create thread\n");
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
DPR("StartStream: started...\n");
|
||||
}
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
StopStream(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
void *ret;
|
||||
int err;
|
||||
|
||||
DPR("StopStream: s=%d, a=%d\n", s->stopped, s->active);
|
||||
|
||||
if (s->stopped) {
|
||||
DPR("StartStream: already started\n");
|
||||
return paNoError;
|
||||
}
|
||||
s->stopped = 1;
|
||||
if (s->base.streamCallback) {
|
||||
err = pthread_join(s->thread, &ret);
|
||||
if (err) {
|
||||
DPR("SndioStop: couldn't join thread\n");
|
||||
return paUnanticipatedHostError;
|
||||
}
|
||||
}
|
||||
if (!sio_stop(s->hdl))
|
||||
return paUnanticipatedHostError;
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
CloseStream(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
|
||||
DPR("CloseStream:\n");
|
||||
|
||||
if (!s->stopped)
|
||||
StopStream(stream);
|
||||
|
||||
if (s->mode & SIO_REC)
|
||||
free(s->rbuf);
|
||||
if (s->mode & SIO_PLAY)
|
||||
free(s->wbuf);
|
||||
sio_close(s->hdl);
|
||||
PaUtil_TerminateStreamRepresentation(&s->base);
|
||||
PaUtil_TerminateBufferProcessor(&s->bufproc);
|
||||
PaUtil_FreeMemory(s);
|
||||
return paNoError;
|
||||
}
|
||||
|
||||
static PaError
|
||||
AbortStream(PaStream *stream)
|
||||
{
|
||||
DPR("AbortStream:\n");
|
||||
|
||||
return StopStream(stream);
|
||||
}
|
||||
|
||||
static PaError
|
||||
IsStreamStopped(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
|
||||
DPR("IsStreamStopped: s=%d, a=%d\n", s->stopped, s->active);
|
||||
|
||||
return s->stopped;
|
||||
}
|
||||
|
||||
static PaError
|
||||
IsStreamActive(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
|
||||
DPR("IsStreamActive: s=%d, a=%d\n", s->stopped, s->active);
|
||||
|
||||
return s->active;
|
||||
}
|
||||
|
||||
static PaTime
|
||||
GetStreamTime(PaStream *stream)
|
||||
{
|
||||
PaSndioStream *s = (PaSndioStream *)stream;
|
||||
|
||||
return (double)s->realpos / s->base.streamInfo.sampleRate;
|
||||
}
|
||||
|
||||
static PaError
|
||||
IsFormatSupported(struct PaUtilHostApiRepresentation *hostApi,
|
||||
const PaStreamParameters *inputPar,
|
||||
const PaStreamParameters *outputPar,
|
||||
double sampleRate)
|
||||
{
|
||||
PaSndioHostApiRepresentation *sndioHostApi = (PaSndioHostApiRepresentation *)hostApi;
|
||||
struct sio_cap *cap = sndioHostApi->caps[0];
|
||||
struct sio_conf *cf = &cap->confs[0];
|
||||
unsigned i;
|
||||
|
||||
|
||||
if (inputPar && inputPar->channelCount > 0) {
|
||||
if (inputPar->device != 0) {
|
||||
DPR("IsFormatSupported: %d: bad input device\n", inputPar->device);
|
||||
return paInvalidDevice;
|
||||
}
|
||||
if (inputPar->hostApiSpecificStreamInfo) {
|
||||
DPR("IsFormatSupported: input specific info\n");
|
||||
return paIncompatibleHostApiSpecificStreamInfo;
|
||||
}
|
||||
for (i = 0; ; i++) {
|
||||
if (i == 8 * sizeof(unsigned)) {
|
||||
DPR("IsFormatSupported: input channel not found\n");
|
||||
return paInvalidChannelCount;
|
||||
}
|
||||
if ((cf->rchan & (1 << i)) &&
|
||||
(cap->rchan[i] == inputPar->channelCount))
|
||||
break;
|
||||
}
|
||||
}
|
||||
if (outputPar && outputPar->channelCount > 0) {
|
||||
if (outputPar->device != 0) {
|
||||
DPR("IsFormatSupported: %d: bad output device\n", outputPar->device);
|
||||
return paInvalidDevice;
|
||||
}
|
||||
if (outputPar->hostApiSpecificStreamInfo) {
|
||||
DPR("IsFormatSupported: output specific info\n");
|
||||
return paIncompatibleHostApiSpecificStreamInfo;
|
||||
}
|
||||
for (i = 0; ; i++) {
|
||||
if (i == 8 * sizeof(unsigned)) {
|
||||
DPR("IsFormatSupported: output channel not found\n");
|
||||
return paInvalidChannelCount;
|
||||
}
|
||||
if ((cf->pchan & (1 << i)) &&
|
||||
(cap->pchan[i] == outputPar->channelCount))
|
||||
break;
|
||||
}
|
||||
}
|
||||
|
||||
for (i = 0; ; i++) {
|
||||
if (i == 8 * sizeof(unsigned)) {
|
||||
DPR("IsFormatSupported: rate not found\n");
|
||||
return paInvalidSampleRate;
|
||||
}
|
||||
if ((cf->rate & (1 << i)) &&
|
||||
(double)cap->rate[i] > sampleRate * 0.995 &&
|
||||
(double)cap->rate[i] < sampleRate * 1.005)
|
||||
break;
|
||||
}
|
||||
return paFormatIsSupported;
|
||||
}
|
||||
|
||||
static void
|
||||
Terminate(struct PaUtilHostApiRepresentation *hostApi)
|
||||
{
|
||||
PaUtil_FreeMemory(hostApi);
|
||||
}
|
||||
|
||||
PaError
|
||||
PaSndio_Initialize(PaUtilHostApiRepresentation **hostApi, PaHostApiIndex hostApiIndex)
|
||||
{
|
||||
PaSndioHostApiRepresentation *sndioHostApi;
|
||||
PaDeviceInfo *info;
|
||||
struct sio_hdl *hdl;
|
||||
struct sio_cap *cap;
|
||||
struct sio_conf *cf;
|
||||
unsigned i, maxpchan, maxrchan, maxrate;
|
||||
|
||||
DPR("PaSndio_Initialize: initializing...\n");
|
||||
|
||||
/* unusable APIs should return paNoError and a NULL hostApi */
|
||||
*hostApi = NULL;
|
||||
|
||||
sndioHostApi = PaUtil_AllocateMemory(sizeof(PaSndioHostApiRepresentation));
|
||||
if (sndioHostApi == NULL)
|
||||
return paNoError;
|
||||
|
||||
if (!(hdl = sio_open(NULL, SIO_PLAY | SIO_REC, 0)) &&
|
||||
!(hdl = sio_open(NULL, SIO_REC, 0)) &&
|
||||
!(hdl = sio_open(NULL, SIO_PLAY, 0))) {
|
||||
PaUtil_FreeMemory(sndioHostApi);
|
||||
return paNoError;
|
||||
}
|
||||
cap = &sndioHostApi->default_cap;
|
||||
if (!sio_getcap(hdl, cap)) {
|
||||
PaUtil_FreeMemory(sndioHostApi);
|
||||
return paNoError;
|
||||
}
|
||||
cf = &cap->confs[0];
|
||||
maxpchan = maxrchan = maxrate = 0;
|
||||
for (i = 0; i < 8 * sizeof(unsigned); i++) {
|
||||
if ((cf->rchan & (1 << i)) && (maxrchan < cap->rchan[i]))
|
||||
maxrchan = cap->rchan[i];
|
||||
if ((cf->pchan & (1 << i)) && (maxpchan < cap->pchan[i]))
|
||||
maxpchan = cap->pchan[i];
|
||||
if ((cf->rate & (1 << i)) && (maxrate < cap->rate[i]))
|
||||
maxrate = cap->rate[i];
|
||||
}
|
||||
sio_close(hdl);
|
||||
sndioHostApi->caps[0] = cap;
|
||||
|
||||
info = &sndioHostApi->default_info;
|
||||
info->structVersion = 2;
|
||||
info->name = "default";
|
||||
info->hostApi = hostApiIndex;
|
||||
info->maxInputChannels = maxrchan;
|
||||
info->maxOutputChannels = maxpchan;
|
||||
info->defaultLowInputLatency = 0.01;
|
||||
info->defaultLowOutputLatency = 0.01;
|
||||
info->defaultHighInputLatency = 0.5;
|
||||
info->defaultHighOutputLatency = 0.5;
|
||||
info->defaultSampleRate = maxrate;
|
||||
sndioHostApi->infos[0] = info;
|
||||
|
||||
*hostApi = &sndioHostApi->base;
|
||||
(*hostApi)->info.structVersion = 1;
|
||||
(*hostApi)->info.type = paSndio;
|
||||
(*hostApi)->info.name = "libsndio";
|
||||
(*hostApi)->info.deviceCount = 1;
|
||||
(*hostApi)->info.defaultInputDevice = 0;
|
||||
(*hostApi)->info.defaultOutputDevice = 0;
|
||||
(*hostApi)->deviceInfos = sndioHostApi->infos;
|
||||
(*hostApi)->Terminate = Terminate;
|
||||
(*hostApi)->OpenStream = OpenStream;
|
||||
(*hostApi)->IsFormatSupported = IsFormatSupported;
|
||||
|
||||
PaUtil_InitializeStreamInterface(&sndioHostApi->blocking,
|
||||
CloseStream,
|
||||
StartStream,
|
||||
StopStream,
|
||||
AbortStream,
|
||||
IsStreamStopped,
|
||||
IsStreamActive,
|
||||
GetStreamTime,
|
||||
PaUtil_DummyGetCpuLoad,
|
||||
BlockingReadStream,
|
||||
BlockingWriteStream,
|
||||
BlockingGetStreamReadAvailable,
|
||||
BlockingGetStreamWriteAvailable);
|
||||
|
||||
PaUtil_InitializeStreamInterface(&sndioHostApi->callback,
|
||||
CloseStream,
|
||||
StartStream,
|
||||
StopStream,
|
||||
AbortStream,
|
||||
IsStreamStopped,
|
||||
IsStreamActive,
|
||||
GetStreamTime,
|
||||
PaUtil_DummyGetCpuLoad,
|
||||
PaUtil_DummyRead,
|
||||
PaUtil_DummyWrite,
|
||||
PaUtil_DummyGetReadAvailable,
|
||||
PaUtil_DummyGetWriteAvailable);
|
||||
|
||||
DPR("PaSndio_Initialize: done\n");
|
||||
return paNoError;
|
||||
}
|
||||
@ -1,7 +1,14 @@
|
||||
$OpenBSD: patch-Makefile_in,v 1.2 2008/03/24 05:26:46 jakemsr Exp $
|
||||
--- Makefile.in.orig Mon Feb 25 17:37:48 2008
|
||||
+++ Makefile.in Mon Feb 25 18:19:08 2008
|
||||
@@ -136,7 +136,7 @@ SRC_DIRS = \
|
||||
--- Makefile.in.orig Tue Feb 26 02:37:48 2008
|
||||
+++ Makefile.in Sun Jan 18 10:09:36 2009
|
||||
@@ -120,6 +120,7 @@ LTOBJS := $(OBJS:.o=.lo)
|
||||
SRC_DIRS = \
|
||||
src/common \
|
||||
src/hostapi/alsa \
|
||||
+ src/hostapi/sndio \
|
||||
src/hostapi/asihpi \
|
||||
src/hostapi/asio \
|
||||
src/hostapi/coreaudio \
|
||||
@@ -136,7 +137,7 @@ SRC_DIRS = \
|
||||
SUBDIRS =
|
||||
@ENABLE_CXX_TRUE@SUBDIRS += bindings/cpp
|
||||
|
||||
|
||||
@ -1,40 +0,0 @@
|
||||
$OpenBSD: patch-configure,v 1.2 2008/03/24 05:26:46 jakemsr Exp $
|
||||
--- configure.orig Mon Feb 25 17:37:48 2008
|
||||
+++ configure Mon Feb 25 18:37:09 2008
|
||||
@@ -19799,7 +19799,7 @@ fi
|
||||
|
||||
|
||||
|
||||
-for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h
|
||||
+for ac_header in sys/soundcard.h linux/soundcard.h machine/soundcard.h soundcard.h
|
||||
do
|
||||
as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
|
||||
if { as_var=$as_ac_Header; eval "test \"\${$as_var+set}\" = set"; }; then
|
||||
@@ -21711,13 +21711,13 @@ _ACEOF
|
||||
|
||||
*)
|
||||
|
||||
- { echo "$as_me:$LINENO: checking for pthread_create in -lpthread" >&5
|
||||
-echo $ECHO_N "checking for pthread_create in -lpthread... $ECHO_C" >&6; }
|
||||
+ { echo "$as_me:$LINENO: checking for pthread_create in -pthread" >&5
|
||||
+echo $ECHO_N "checking for pthread_create in -pthread... $ECHO_C" >&6; }
|
||||
if test "${ac_cv_lib_pthread_pthread_create+set}" = set; then
|
||||
echo $ECHO_N "(cached) $ECHO_C" >&6
|
||||
else
|
||||
ac_check_lib_save_LIBS=$LIBS
|
||||
-LIBS="-lpthread $LIBS"
|
||||
+LIBS="-pthread $LIBS"
|
||||
cat >conftest.$ac_ext <<_ACEOF
|
||||
/* confdefs.h. */
|
||||
_ACEOF
|
||||
@@ -21823,8 +21823,8 @@ _ACEOF
|
||||
|
||||
fi
|
||||
|
||||
- DLL_LIBS="$DLL_LIBS -lm -lpthread"
|
||||
- LIBS="$LIBS -lm -lpthread"
|
||||
+ DLL_LIBS="$DLL_LIBS -lm -pthread"
|
||||
+ LIBS="$LIBS -lm -pthread"
|
||||
PADLL="libportaudio.so"
|
||||
|
||||
## support sun cc compiler flags
|
||||
57
audio/portaudio-svn/patches/patch-configure_in
Normal file
57
audio/portaudio-svn/patches/patch-configure_in
Normal file
@ -0,0 +1,57 @@
|
||||
--- configure.in.orig Mon Feb 25 17:37:48 2008
|
||||
+++ configure.in Sun Mar 8 22:05:20 2009
|
||||
@@ -17,6 +17,10 @@ AC_ARG_WITH(alsa,
|
||||
[ --with-alsa (default=yes)],
|
||||
with_alsa=$withval, with_alsa="yes")
|
||||
|
||||
+AC_ARG_WITH(sndio,
|
||||
+ [ --with-sndio (default=yes)],
|
||||
+ with_sndio=$withval, with_sndio="yes")
|
||||
+
|
||||
AC_ARG_WITH(jack,
|
||||
[ --with-jack (default=yes)],
|
||||
with_jack=$withval, with_jack="yes")
|
||||
@@ -88,6 +92,7 @@ dnl checks for various host APIs and arguments to conf
|
||||
dnl turn them on or off
|
||||
|
||||
AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
|
||||
+AC_CHECK_LIB(sndio, sio_initpar, have_sndio=yes, have_sndio=no)
|
||||
AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
|
||||
AC_CHECK_LIB(ossaudio, _oss_ioctl, have_libossaudio=yes, have_libossaudio=no)
|
||||
|
||||
@@ -295,8 +300,8 @@ case "${host_os}" in
|
||||
*)
|
||||
dnl Unix configuration
|
||||
|
||||
- AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
|
||||
- AC_MSG_ERROR([libpthread not found!]))
|
||||
+ dnl AC_CHECK_LIB(pthread, pthread_create,[have_pthread="yes"],
|
||||
+ dnl AC_MSG_ERROR([libpthread not found!]))
|
||||
|
||||
if [[ $have_alsa = "yes" ] && [ $with_alsa != "no" ]] ; then
|
||||
DLL_LIBS="$DLL_LIBS -lasound"
|
||||
@@ -305,6 +310,13 @@ case "${host_os}" in
|
||||
AC_DEFINE(PA_USE_ALSA)
|
||||
fi
|
||||
|
||||
+ if [[ "$have_sndio" = "yes" -a "$with_sndio" != "no" ]] ; then
|
||||
+ DLL_LIBS="$DLL_LIBS -lsndio"
|
||||
+ LIBS="$LIBS -lsndio"
|
||||
+ OTHER_OBJS="$OTHER_OBJS src/hostapi/sndio/pa_sndio.o"
|
||||
+ AC_DEFINE(PA_USE_SNDIO)
|
||||
+ fi
|
||||
+
|
||||
if [[ $have_jack = "yes" ] && [ $with_jack != "no" ]] ; then
|
||||
DLL_LIBS="$DLL_LIBS $JACK_LIBS"
|
||||
CFLAGS="$CFLAGS $JACK_CFLAGS"
|
||||
@@ -328,8 +340,8 @@ case "${host_os}" in
|
||||
AC_DEFINE(PA_USE_ASIHPI)
|
||||
fi
|
||||
|
||||
- DLL_LIBS="$DLL_LIBS -lm -lpthread"
|
||||
- LIBS="$LIBS -lm -lpthread"
|
||||
+ DLL_LIBS="$DLL_LIBS -lm -pthread"
|
||||
+ LIBS="$LIBS -lm -pthread"
|
||||
PADLL="libportaudio.so"
|
||||
|
||||
## support sun cc compiler flags
|
||||
13
audio/portaudio-svn/patches/patch-include_portaudio_h
Normal file
13
audio/portaudio-svn/patches/patch-include_portaudio_h
Normal file
@ -0,0 +1,13 @@
|
||||
$OpenBSD: patch-include_portaudio_h,v 1.1 2009/03/14 02:31:40 jakemsr Exp $
|
||||
--- include/portaudio.h.orig Mon Feb 25 17:37:40 2008
|
||||
+++ include/portaudio.h Sun Mar 8 21:55:43 2009
|
||||
@@ -236,7 +236,8 @@ typedef enum PaHostApiTypeId
|
||||
paWDMKS=11,
|
||||
paJACK=12,
|
||||
paWASAPI=13,
|
||||
- paAudioScienceHPI=14
|
||||
+ paAudioScienceHPI=14,
|
||||
+ paSndio=15
|
||||
} PaHostApiTypeId;
|
||||
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
$OpenBSD: patch-src_hostapi_oss_pa_unix_oss_c,v 1.4 2008/03/24 05:26:46 jakemsr Exp $
|
||||
--- src/hostapi/oss/pa_unix_oss.c.orig Mon Feb 25 17:37:41 2008
|
||||
+++ src/hostapi/oss/pa_unix_oss.c Mon Feb 25 18:32:40 2008
|
||||
@@ -76,6 +76,9 @@
|
||||
#elif defined(HAVE_MACHINE_SOUNDCARD_H)
|
||||
# include <machine/soundcard.h> /* JH20010905 */
|
||||
# define DEVICE_NAME_BASE "/dev/audio"
|
||||
+#elif defined(HAVE_SOUNDCARD_H)
|
||||
+# include <soundcard.h>
|
||||
+# define DEVICE_NAME_BASE "/dev/audio"
|
||||
#else
|
||||
# error No sound card header file
|
||||
#endif
|
||||
@@ -409,8 +412,15 @@ static PaError QueryDirection( const char *deviceName,
|
||||
if( *defaultSampleRate < 0 )
|
||||
{
|
||||
sr = 44100;
|
||||
- ENSURE_( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ), paUnanticipatedHostError );
|
||||
-
|
||||
+ if( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ) < 0 )
|
||||
+ {
|
||||
+ sr = 48000;
|
||||
+ if( ioctl( devHandle, SNDCTL_DSP_SPEED, &sr ) < 0 )
|
||||
+ {
|
||||
+ result = paUnanticipatedHostError;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ }
|
||||
*defaultSampleRate = sr;
|
||||
}
|
||||
|
||||
@@ -594,6 +604,7 @@ static PaError IsFormatSupported( struct PaUtilHostApi
|
||||
int tempDevHandle = -1;
|
||||
int flags;
|
||||
PaSampleFormat inputSampleFormat, outputSampleFormat;
|
||||
+ int sr;
|
||||
|
||||
if( inputParameters )
|
||||
{
|
||||
@@ -689,6 +700,43 @@ static PaError IsFormatSupported( struct PaUtilHostApi
|
||||
/* PaOssStream_Configure will do the rest of the checking for us */
|
||||
/* PA_ENSURE( PaOssStream_Configure( tempDevHandle, deviceName, outputChannelCount, &sampleRate ) ); */
|
||||
|
||||
+ /* try to set the number of channels */
|
||||
+ if (outputChannelCount > 0) {
|
||||
+ if ( ioctl( tempDevHandle, SNDCTL_DSP_CHANNELS, &outputChannelCount ) < 0 ) {
|
||||
+ result = paInvalidChannelCount;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ if (outputChannelCount != outputParameters->channelCount) {
|
||||
+ result = paInvalidChannelCount;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ }
|
||||
+ if ((inputChannelCount > 0) && (inputChannelCount != outputChannelCount)) {
|
||||
+ if ( ioctl( tempDevHandle, SNDCTL_DSP_CHANNELS, &inputChannelCount ) < 0 ) {
|
||||
+ result = paInvalidChannelCount;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ if (inputChannelCount != inputParameters->channelCount) {
|
||||
+ result = paInvalidChannelCount;
|
||||
+ goto error;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
+ /* try to set the sample rate */
|
||||
+ sr = (int)sampleRate;
|
||||
+
|
||||
+ if ( ioctl( tempDevHandle, SNDCTL_DSP_SPEED, &sr ) < 0) {
|
||||
+ result = paInvalidSampleRate;
|
||||
+ goto error;
|
||||
+ }
|
||||
+
|
||||
+ /* reject if there's no sample rate within 1% of the one requested */
|
||||
+ if( (fabs( sampleRate - (double)sr ) / sampleRate) > 0.01 )
|
||||
+ {
|
||||
+ result = paInvalidSampleRate;
|
||||
+ goto error;
|
||||
+ }
|
||||
+
|
||||
/* everything succeeded! */
|
||||
|
||||
error:
|
||||
@@ -807,9 +855,11 @@ static PaError OpenDevices( const char *idevName, cons
|
||||
ENSURE_( *idev = open( idevName, flags ), paDeviceUnavailable );
|
||||
PA_ENSURE( ModifyBlocking( *idev, 1 ) ); /* Blocking */
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
/* Initially disable */
|
||||
enableBits = ~PCM_ENABLE_INPUT;
|
||||
ENSURE_( ioctl( *idev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
|
||||
+#endif
|
||||
}
|
||||
if( odevName )
|
||||
{
|
||||
@@ -818,9 +868,11 @@ static PaError OpenDevices( const char *idevName, cons
|
||||
ENSURE_( *odev = open( odevName, flags ), paDeviceUnavailable );
|
||||
PA_ENSURE( ModifyBlocking( *odev, 1 ) ); /* Blocking */
|
||||
|
||||
+#ifndef __OpenBSD__
|
||||
/* Initially disable */
|
||||
enableBits = ~PCM_ENABLE_OUTPUT;
|
||||
ENSURE_( ioctl( *odev, SNDCTL_DSP_SETTRIGGER, &enableBits ), paUnanticipatedHostError );
|
||||
+#endif
|
||||
}
|
||||
else
|
||||
{
|
||||
@ -0,0 +1,23 @@
|
||||
$OpenBSD: patch-src_os_unix_pa_unix_hostapis_c,v 1.1 2009/03/14 02:31:40 jakemsr Exp $
|
||||
--- src/os/unix/pa_unix_hostapis.c.orig Thu May 22 01:47:01 2008
|
||||
+++ src/os/unix/pa_unix_hostapis.c Sun Mar 8 22:53:55 2009
|
||||
@@ -44,6 +44,7 @@
|
||||
|
||||
PaError PaJack_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
|
||||
PaError PaAlsa_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
|
||||
+PaError PaSndio_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
|
||||
PaError PaOSS_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
|
||||
/* Added for IRIX, Pieter, oct 2, 2003: */
|
||||
PaError PaSGI_Initialize( PaUtilHostApiRepresentation **hostApi, PaHostApiIndex index );
|
||||
@@ -79,6 +80,11 @@ PaUtilHostApiInitializer *paHostApiInitializers[] =
|
||||
#endif
|
||||
|
||||
#endif /* __linux__ */
|
||||
+
|
||||
+
|
||||
+#ifdef PA_USE_SNDIO
|
||||
+ PaSndio_Initialize,
|
||||
+#endif
|
||||
|
||||
#ifdef PA_USE_JACK
|
||||
PaJack_Initialize,
|
||||
Loading…
x
Reference in New Issue
Block a user