--- fastaudio.pyx.orig Sat Mar 3 10:53:45 2007 +++ fastaudio.pyx Sat Mar 3 11:03:03 2007 @@ -92,7 +92,7 @@ #@+node:portaudio.h # portaudio-specifics -cdef extern from "../pa_common/portaudio.h": +cdef extern from "/usr/local/include/portaudio.h": ctypedef int PaError cdef enum PA_ERRORS: @@ -586,8 +586,8 @@ cdata.framesPerBuf = framesPerBuf cdata.bytesPerFrame = channels * _sampleFormatSizes[format] cdata.bytesPerBuf = framesPerBuf * cdata.bytesPerFrame - cdata.txFifo = fifoNew(cdata.bytesPerBuf, maxbufs, 't') - cdata.rxFifo = fifoNew(cdata.bytesPerBuf, maxbufs, 'r') + cdata.txFifo = fifoNew(cdata.bytesPerBuf, maxbufs, 't') + cdata.rxFifo = fifoNew(cdata.bytesPerBuf, maxbufs, 'r') printf("__new__: txFifo=%lx rxFifo=%lx\n", cdata.txFifo, cdata.rxFifo) cdata.hits = 0 cdata.running = 1 @@ -1113,28 +1113,28 @@ # write to output buffer, converting to output format if cChansOut == 1: if outFormat == paInt8: - outPtr_8[idxOut] = (frameLeft + frameRight) / (2 * 0x1000000) + outPtr_8[idxOut] = (frameLeft + frameRight) / (2 * 0x1000000) elif outFormat == paUInt8: - outPtr_u8[idxOut] = (frameLeft + frameRight) / (2 * 0x1000000) + outPtr_u8[idxOut] = (frameLeft + frameRight) / (2 * 0x1000000) elif outFormat == paInt16: - outPtr_16[idxOut] = (frameLeft + frameRight) / (2 * 0x10000) + outPtr_16[idxOut] = (frameLeft + frameRight) / (2 * 0x10000) elif outFormat == paInt32: - outPtr_32[idxOut] = (frameLeft + frameRight) / 2 + outPtr_32[idxOut] = (frameLeft + frameRight) / 2 elif outFormat == paFloat32: outPtr_f32[idxOut] = (frameLeft + frameRight) / 2 else: if outFormat == paInt8: - outPtr_8[idxOut * 2] = frameLeft / 0x1000000 - outPtr_8[idxOut * 2 + 1] = frameRight / 0x1000000 + outPtr_8[idxOut * 2] = frameLeft / 0x1000000 + outPtr_8[idxOut * 2 + 1] = frameRight / 0x1000000 elif outFormat == paUInt8: - outPtr_u8[idxOut * 2] = frameLeft / 0x1000000 - outPtr_u8[idxOut * 2 + 1] = frameRight / 0x1000000 + outPtr_u8[idxOut * 2] = frameLeft / 0x1000000 + outPtr_u8[idxOut * 2 + 1] = frameRight / 0x1000000 elif outFormat == paInt16: - outPtr_16[idxOut * 2] = frameLeft / 0x10000 - outPtr_16[idxOut * 2 + 1] = frameRight / 0x10000 + outPtr_16[idxOut * 2] = frameLeft / 0x10000 + outPtr_16[idxOut * 2 + 1] = frameRight / 0x10000 elif outFormat == paInt32: - outPtr_32[idxOut * 2] = frameLeft - outPtr_32[idxOut * 2 + 1] = frameRight + outPtr_32[idxOut * 2] = frameLeft + outPtr_32[idxOut * 2 + 1] = frameRight elif outFormat == paFloat32: outPtr_f32[idxOut * 2] = frameLeft outPtr_f32[idxOut * 2 + 1] = frameRight