Update of /cvsroot/pure-data/pd/portaudio/pa_linux_alsa In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1508/pd/portaudio/pa_linux_alsa

Modified Files: pa_linux_alsa.c pa_linux_alsa.h Log Message: Remembered to update all the edited files. Should now be in sync... will have to test it though.

Index: pa_linux_alsa.c =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_linux_alsa/pa_linux_alsa.c,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** pa_linux_alsa.c 18 May 2005 04:28:37 -0000 1.8 --- pa_linux_alsa.c 30 May 2005 03:04:10 -0000 1.9 *************** *** 3,9 **** * PortAudio Portable Real-Time Audio Library * Latest Version at: http://www.portaudio.com ! * ALSA implementation by Joshua Haberman * * Copyright (c) 2002 Joshua Haberman joshua@haberman.com * * Based on the Open Source API proposed by Ross Bencina --- 3,10 ---- * PortAudio Portable Real-Time Audio Library * Latest Version at: http://www.portaudio.com [...4844 lines suppressed...] ! unsigned long avail; ! int xrun;

! PA_ENSURE( PaAlsaStreamComponent_GetAvailableFrames( &stream->playback, &avail, &xrun ) ); ! if( xrun ) { ! snd_pcm_sframes_t savail;

! PA_ENSURE( PaAlsaStream_HandleXrun( stream ) ); ! savail = snd_pcm_avail_update( stream->playback.pcm ); ! ! /* savail should not contain -EPIPE now, since PaAlsaStream_HandleXrun will only prepare the pcm */ ! ENSURE_( savail, paUnanticipatedHostError ); ! ! avail = (unsigned long) savail; }

! return (signed long)avail;

error:

Index: pa_linux_alsa.h =================================================================== RCS file: /cvsroot/pure-data/pd/portaudio/pa_linux_alsa/pa_linux_alsa.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** pa_linux_alsa.h 6 Sep 2004 20:44:39 -0000 1.3 --- pa_linux_alsa.h 30 May 2005 03:04:10 -0000 1.4 *************** *** 2,5 **** --- 2,41 ---- #define PA_LINUX_ALSA_H

+ /* + * $Id$ + * PortAudio Portable Real-Time Audio Library + * ALSA-specific extensions + * + * Copyright (c) 1999-2000 Ross Bencina and Phil Burk + * + * Permission is hereby granted, free of charge, to any person obtaining + * a copy of this software and associated documentation files + * (the "Software"), to deal in the Software without restriction, + * including without limitation the rights to use, copy, modify, merge, + * publish, distribute, sublicense, and/or sell copies of the Software, + * and to permit persons to whom the Software is furnished to do so, + * subject to the following conditions: + * + * The above copyright notice and this permission notice shall be + * included in all copies or substantial portions of the Software. + * + * Any person wishing to distribute modifications to the Software is + * requested to send the modifications to the original developer so that + * they can be incorporated into the canonical version. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. + * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR + * ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF + * CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION + * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. + * + */ + + /** @file + * ALSA-specific PortAudio API extension header file. + */ + #ifdef __cplusplus extern "C" {