Update of /cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/alsa
In directory
23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3281/portaudio-v19/src/hostapi/alsa
Modified Files:
pa_linux_alsa.c
Log Message:
Fix (hopefully) problem with mixer not showing up on Linux.
Index: pa_linux_alsa.c
===================================================================
RCS file:
/cvsroot/audacity/lib-src/portaudio-v19/src/hostapi/alsa/pa_linux_alsa.c,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- pa_linux_alsa.c 25 May 2009 21:40:16 -0000 1.11
+++ pa_linux_alsa.c 30 Jun 2009 04:52:59 -0000 1.12
@@ -134,6 +134,7 @@
StreamDirection streamDir;
snd_pcm_channel_area_t *channelAreas; /* Needed for channel adaption */
+ int card;
} PaAlsaStreamComponent;
/* Implementation specific stream structure */
@@ -1161,6 +1162,7 @@
{
PaError result = paNoError;
PaSampleFormat userSampleFormat = params->sampleFormat, hostSampleFormat;
+ snd_pcm_info_t* pcmInfo;
assert( params->channelCount > 0 );
/* Make sure things have an initial value */
@@ -1181,6 +1183,9 @@
self->device = params->device;
PA_ENSURE( AlsaOpen( &alsaApi->baseHostApiRep, params, streamDir,
&self->pcm ) );
+
+ snd_pcm_info_alloca( &pcmInfo );
+ self->card = snd_pcm_info_get_card( pcmInfo );
self->nfds = snd_pcm_poll_descriptors_count( self->pcm );
hostSampleFormat = PaUtil_SelectClosestAvailableFormat(
GetAvailableFormats( self->pcm ), userSampleFormat );
@@ -3646,9 +3651,7 @@
/* XXX: More descriptive error? */
PA_UNLESS( stream->capture.pcm, paDeviceUnavailable );
- snd_pcm_info_alloca( &pcmInfo );
- PA_ENSURE( snd_pcm_info( stream->capture.pcm, pcmInfo ) );
- *card = snd_pcm_info_get_card( pcmInfo );
+ *card = stream->capture.card;
error:
return result;
@@ -3664,9 +3667,7 @@
/* XXX: More descriptive error? */
PA_UNLESS( stream->playback.pcm, paDeviceUnavailable );
- snd_pcm_info_alloca( &pcmInfo );
- PA_ENSURE( snd_pcm_info( stream->playback.pcm, pcmInfo ) );
- *card = snd_pcm_info_get_card( pcmInfo );
+ *card = stream->playback.card;
error:
return result;
------------------------------------------------------------------------------
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
