Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv23220/alsa
Modified Files:
alsa-oss.c pcm.c
Log Message:
- fixed poll and select code
- more work on osstest utility
Index: alsa-oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/alsa/alsa-oss.c,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- alsa-oss.c 18 Feb 2004 20:17:05 -0000 1.6
+++ alsa-oss.c 19 Feb 2004 16:02:20 -0000 1.7
@@ -385,7 +385,7 @@
{
unsigned short events = pfds[k].events;
int fmode = 0;
- if (events & (POLLIN|POLLOUT))
+ if ((events & (POLLIN|POLLOUT)) == (POLLIN|POLLOUT))
fmode = O_RDWR;
else if (events & POLLIN)
fmode = O_RDONLY;
@@ -436,6 +436,7 @@
((result & OSS_WAIT_EVENT_READ) ? POLLIN :
0) |
((result & OSS_WAIT_EVENT_WRITE) ? POLLOUT
: 0);
}
+ nfds1 += lib_oss_pcm_poll_fds(fd);
break;
}
default:
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- pcm.c 18 Feb 2004 20:17:05 -0000 1.5
+++ pcm.c 19 Feb 2004 16:02:21 -0000 1.6
@@ -1476,7 +1476,7 @@
result |= OSS_WAIT_EVENT_ERROR;
if (revents & POLLIN)
result |= OSS_WAIT_EVENT_READ;
- if (revents & POLLIN)
+ if (revents & POLLOUT)
result |= OSS_WAIT_EVENT_WRITE;
ufds += count;
}
-------------------------------------------------------
SF.Net is sponsored by: Speed Start Your Linux Apps Now.
Build and deploy apps & Web services for Linux with
a free DVD software kit from IBM. Click Now!
http://ads.osdn.com/?ad_id=1356&alloc_id=3438&op=click
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
