Update of /cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/alsa
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22516/src/hostapi/alsa
Modified Files:
pa_linux_alsa.c
Log Message:
Bringing PortAudio up to their latest SVN sources.
Index: pa_linux_alsa.c
===================================================================
RCS file:
/cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pa_linux_alsa.c 10 Jun 2006 21:30:55 -0000 1.1
+++ pa_linux_alsa.c 23 Sep 2006 18:42:47 -0000 1.2
@@ -21,10 +21,6 @@
* 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.
@@ -34,6 +30,22 @@
* WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/
+/*
+ * The text above constitutes the entire PortAudio license; however,
+ * the PortAudio community also makes the following non-binding requests:
+ *
+ * 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. It is also
+ * requested that these non-binding requests be included along with the
+ * license above.
+ */
+
+/**
+ @file
+ @ingroup hostapi_src
+*/
+
#define ALSA_PCM_NEW_HW_PARAMS_API
#define ALSA_PCM_NEW_SW_PARAMS_API
#include <alsa/asoundlib.h>
@@ -518,6 +530,7 @@
if( snd_ctl_open( &ctl, alsaCardName, 0 ) < 0 )
{
/* Unable to open card :( */
+ PA_DEBUG(( "%s: Unable to open device %s\n", __FUNCTION__,
alsaCardName ));
continue;
}
snd_ctl_card_info( ctl, cardInfo );
@@ -834,7 +847,8 @@
{
PaError result = paNoError;
int ret;
- const char *deviceName = alloca( 50 );
+ char dnameArray[50];
+ const char* deviceName = dnameArray;
const PaAlsaDeviceInfo *deviceInfo = NULL;
PaAlsaStreamInfo *streamInfo = (PaAlsaStreamInfo
*)params->hostApiSpecificStreamInfo;
@@ -847,7 +861,7 @@
if( !strncmp( "hw:", deviceInfo->alsaName, 3 ) && getenv(
"PA_ALSA_PLUGHW" ) )
usePlug = atoi( getenv( "PA_ALSA_PLUGHW" ) );
if( usePlug )
- snprintf( (char *) deviceName, 50, "plug%s", deviceInfo->alsaName
);
+ snprintf( dnameArray, 50, "plug%s", deviceInfo->alsaName );
else
deviceName = deviceInfo->alsaName;
}
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
