Update of /cvsroot/audacity/lib-src/portmixer/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv27584/portmixer/src
Modified Files:
px_linux_alsa.c px_mixer.c px_unix_oss.c
Log Message:
Update portaudio to 2007-jun-01 snapshot
Index: px_linux_alsa.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portmixer/src/px_linux_alsa.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- px_linux_alsa.c 2 Oct 2006 00:27:52 -0000 1.1
+++ px_linux_alsa.c 3 Jun 2007 08:30:36 -0000 1.2
@@ -216,15 +216,13 @@
info = (PxInfo *) Px->info;
- card = PaAlsa_GetInputCard(Px->pa_stream);
- if (card >= 0) {
+ if (PaAlsa_GetStreamInputCard(Px->pa_stream, &card) == paNoError) {
if (!open_mixer(&info->capture, card, FALSE)) {
return cleanup(Px);
}
}
- card = PaAlsa_GetOutputCard(Px->pa_stream);
- if (card >= 0) {
+ if (PaAlsa_GetStreamOutputCard(Px->pa_stream, &card) == paNoError) {
if (!open_mixer(&info->playback, card, TRUE)) {
return cleanup(Px);
}
Index: px_unix_oss.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portmixer/src/px_unix_oss.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- px_unix_oss.c 2 Oct 2006 00:27:52 -0000 1.1
+++ px_unix_oss.c 3 Jun 2007 08:30:36 -0000 1.2
@@ -113,17 +113,17 @@
name[strlen(MIXER_NAME_BASE)] = 0;
else
name[strlen(MIXER_NAME_BASE)] = '0' + (id - 1);
-
+fprintf(stderr, "open mixer %s\n", name);
do {
dev->fd = open(name, O_RDWR);
if (dev->fd < 0) {
break;
};
-
+fprintf(stderr, "getting cmd %d\n", cmd);
if (ioctl(dev->fd, cmd, &mask) == -1) {
break;
}
-
+fprintf(stderr, "mask %08x\n", mask);
dev->num = 0;
for (i = 0; i < SOUND_MIXER_NRDEVICES; i++) {
@@ -131,7 +131,7 @@
dev->chans[dev->num++] = i;
}
}
-
+fprintf(stderr, "return good %d\n", dev->num);
return TRUE;
} while (FALSE);
@@ -149,6 +149,7 @@
PxInfo *info;
if (!initialize(Px)) {
+fprintf(stderr, "init failed\n");
return FALSE;
}
@@ -161,14 +162,15 @@
info->playback.num = 0;
do {
- info->capture.name = PaOSS_GetInputDevice(Px->pa_stream);
+ info->capture.name = PaOSS_GetStreamInputDevice(Px->pa_stream);
+fprintf(stderr, "capture.name = %s\n", info->capture.name);
if (info->capture.name) {
if (!open_mixer(&info->capture, SOUND_MIXER_READ_RECMASK)) {
break;
}
}
- info->playback.name = PaOSS_GetOutputDevice(Px->pa_stream);
+ info->playback.name = PaOSS_GetStreamOutputDevice(Px->pa_stream);
if (info->playback.name) {
if (!open_mixer(&info->playback, SOUND_MIXER_READ_DEVMASK)) {
break;
@@ -269,7 +271,7 @@
PxInfo *info = (PxInfo *)Px->info;
int i;
int fd;
-
+fprintf(stderr, "get num mixers\n");
info->numMixers = 0;
for (i = 0; i < MIXER_COUNT_MAX; i++) {
@@ -279,15 +281,17 @@
info->mixers[i][strlen(MIXER_NAME_BASE)] = 0;
else
info->mixers[i][strlen(MIXER_NAME_BASE)] = '0' + (i - 1);
-
+fprintf(stderr, "opening %s\n", info->mixers[i]);
fd = open(info->mixers[i], O_RDWR);
+fprintf(stderr, "opening fd %d\n", fd);
if (fd >= 0) {
+fprintf(stderr, "found one %d %d\n", i, info->numMixers);
info->mixerIndexes[info->numMixers] = i;
info->numMixers++;
close(fd);
}
}
-
+fprintf(stderr, "num mixers %d\n", info->numMixers);
return info->numMixers;
}
@@ -436,7 +440,7 @@
static int get_num_input_sources(px_mixer *Px)
{
PxInfo *info = (PxInfo *)Px->info;
-
+fprintf(stderr, "info->capture.num %d\n", info->capture.num);
return info->capture.num;
}
Index: px_mixer.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portmixer/src/px_mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- px_mixer.c 2 Oct 2006 00:27:52 -0000 1.1
+++ px_mixer.c 3 Jun 2007 08:30:36 -0000 1.2
@@ -68,6 +68,8 @@
int OpenMixer_Linux_ALSA(px_mixer *Px, int index);
#endif
+#include <stdio.h>
+#include <stdlib.h>
#if defined(_DEBUG)
#include <stdio.h>
#include <stdlib.h>
@@ -122,6 +124,8 @@
return NULL;
}
+fprintf(stderr, "stream type %d\n", Pa_GetStreamHostApiType(pa_stream));
+
switch (Pa_GetStreamHostApiType(pa_stream))
{
#if defined(PX_USE_WIN_MME)
@@ -326,6 +330,7 @@
int Px_GetNumInputSources(PxMixer *mixer)
{
px_mixer *Px = verify_mixer(mixer);
+fprintf(stderr, "px = %p\n", Px);
if (!Px)
return 0;
-------------------------------------------------------------------------
This SF.net email is sponsored by DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Audacity-cvs mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/audacity-cvs
