Update of /cvsroot/audacity/lib-src/portmixer/src
In directory sc8-pr-cvs11.sourceforge.net:/tmp/cvs-serv22929
Modified Files:
px_unix_oss.c
Log Message:
Remove even more debugging
Index: px_unix_oss.c
===================================================================
RCS file: /cvsroot/audacity/lib-src/portmixer/src/px_unix_oss.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- px_unix_oss.c 3 Jun 2007 08:30:36 -0000 1.2
+++ px_unix_oss.c 3 Jun 2007 09:39:32 -0000 1.3
@@ -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,6 @@
dev->chans[dev->num++] = i;
}
}
-fprintf(stderr, "return good %d\n", dev->num);
return TRUE;
} while (FALSE);
@@ -149,7 +148,6 @@
PxInfo *info;
if (!initialize(Px)) {
-fprintf(stderr, "init failed\n");
return FALSE;
}
@@ -163,7 +161,7 @@
do {
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;
@@ -271,7 +269,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++) {
@@ -281,17 +279,15 @@
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;
}
@@ -440,7 +436,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;
}
-------------------------------------------------------------------------
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