Update of /cvsroot/alsa/alsa-oss/alsa
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv30199/alsa
Modified Files:
alsa-oss.c mixer.c pcm.c
Log Message:
- finished poll/select related functions for ALSA->OSS pcm emulation
- fixed some trivial bugs - mpg123 works again using libaoss
Index: alsa-oss.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/alsa/alsa-oss.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- alsa-oss.c 10 Feb 2004 13:39:55 -0000 1.2
+++ alsa-oss.c 11 Feb 2004 19:09:03 -0000 1.3
@@ -73,7 +73,6 @@
typedef struct {
int count;
fd_class_t class;
- void *private;
void *mmap_area;
} fd_t;
@@ -195,6 +194,12 @@
!strncmp(file, "/dev/audio", 10)) {
fd = lib_oss_pcm_open(file, oflag);
if (fd >= 0) {
+ fds[fd] = calloc(sizeof(fd_t), 1);
+ if (fds[fd] == NULL) {
+ ops[FD_OSS_DSP].close(fd);
+ errno = ENOMEM;
+ return -1;
+ }
fds[fd]->class = FD_OSS_DSP;
poll_fds_add += lib_oss_pcm_poll_fds(fd);
}
@@ -216,7 +221,7 @@
} else {
fd_t *xfd = fds[fd];
int err;
-
+
fds[fd] = NULL;
poll_fds_add -= lib_oss_pcm_poll_fds(fd);
err = ops[xfd->class].close(fd);
@@ -251,7 +256,7 @@
va_end(args);
if (fd < 0 || fd >= open_max || fds[fd] == NULL)
return _ioctl(fd, request, arg);
- else
+ else
return ops[fds[fd]->class].ioctl(fd, request, arg);
}
Index: mixer.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/alsa/mixer.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mixer.c 10 Feb 2004 13:40:36 -0000 1.1
+++ mixer.c 11 Feb 2004 19:09:03 -0000 1.2
@@ -245,7 +245,7 @@
result = snd_mixer_load(mixer->mix);
if (result < 0)
goto _error1;
- mixer->fileno = result;
+ mixer->fileno = fd;
insert_fd(mixer);
return fd;
_error1:
Index: pcm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-oss/alsa/pcm.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- pcm.c 10 Feb 2004 13:40:36 -0000 1.1
+++ pcm.c 11 Feb 2004 19:09:03 -0000 1.2
@@ -549,7 +549,7 @@
result = oss_dsp_params(dsp);
if (result < 0)
goto _error;
- xfd->fileno = result;
+ xfd->fileno = fd;
insert_fd(xfd);
return fd;
@@ -1264,6 +1264,196 @@
return 0;
}
+int lib_oss_pcm_select_prepare(int fd, fd_set *readfds, fd_set *writefds, fd_set
*exceptfds)
+{
+ oss_dsp_t *dsp = look_for_dsp(fd);
+ int k;
+
+ if (dsp == NULL) {
+ errno = EBADFD;
+ return -1;
+ }
+ for (k = 0; k < 2; ++k) {
+ snd_pcm_t *pcm = dsp->streams[k].pcm;
+ int err, count;
+ if (!pcm)
+ continue;
+ count = snd_pcm_poll_descriptors_count(pcm);
+ if (count < 0) {
+ errno = -count;
+ return -1;
+ }
+ {
+ struct pollfd ufds[count];
+ int j;
+ err = snd_pcm_poll_descriptors(pcm, ufds, count);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ for (j = 0; j < count; j++) {
+ int fd = ufds[j].fd;
+ unsigned short events = ufds[j].events;
+ FD_CLR(fd, readfds);
+ FD_CLR(fd, writefds);
+ FD_CLR(fd, exceptfds);
+ if (events & POLLIN)
+ FD_SET(fd, readfds);
+ if (events & POLLOUT)
+ FD_SET(fd, writefds);
+ if (events & (POLLERR|POLLNVAL))
+ FD_SET(fd, exceptfds);
+ }
+ }
+ }
+ return 0;
+}
+
+int lib_oss_pcm_select_result(int fd, fd_set *readfds, fd_set *writefds, fd_set
*exceptfds)
+{
+ oss_dsp_t *dsp = look_for_dsp(fd);
+ int k, result = 0;
+
+ if (dsp == NULL) {
+ errno = EBADFD;
+ return -1;
+ }
+ for (k = 0; k < 2; ++k) {
+ snd_pcm_t *pcm = dsp->streams[k].pcm;
+ int err, count;
+ if (!pcm)
+ continue;
+ count = snd_pcm_poll_descriptors_count(pcm);
+ if (count < 0) {
+ errno = -count;
+ return -1;
+ }
+ {
+ struct pollfd ufds[count];
+ int j;
+ unsigned short revents;
+ err = snd_pcm_poll_descriptors(pcm, ufds, count);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ for (j = 0; j < count; j++) {
+ int fd = ufds[j].fd;
+ revents = 0;
+ if (FD_ISSET(fd, readfds))
+ revents |= POLLIN;
+ if (FD_ISSET(fd, writefds))
+ revents |= POLLOUT;
+ if (FD_ISSET(fd, exceptfds))
+ revents |= POLLERR;
+ ufds[j].revents = revents;
+ }
+ err = snd_pcm_poll_descriptors_revents(pcm, ufds, count,
&revents);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ if (revents & (POLLNVAL|POLLERR))
+ result |= OSS_WAIT_EVENT_ERROR;
+ if (revents & POLLIN)
+ result |= OSS_WAIT_EVENT_READ;
+ if (revents & POLLIN)
+ result |= OSS_WAIT_EVENT_WRITE;
+ }
+ }
+ return result;
+}
+
+extern int lib_oss_pcm_poll_fds(int fd)
+{
+ oss_dsp_t *dsp = look_for_dsp(fd);
+ int k, result = 0;
+
+ if (dsp == NULL) {
+ errno = EBADFD;
+ return -1;
+ }
+ for (k = 0; k < 2; ++k) {
+ snd_pcm_t *pcm = dsp->streams[k].pcm;
+ int err;
+ if (!pcm)
+ continue;
+ err = snd_pcm_poll_descriptors_count(pcm);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ result += err;
+ }
+ return result;
+}
+
+int lib_oss_pcm_poll_prepare(int fd, struct pollfd *ufds)
+{
+ oss_dsp_t *dsp = look_for_dsp(fd);
+ int k;
+
+ if (dsp == NULL) {
+ errno = EBADFD;
+ return -1;
+ }
+ for (k = 0; k < 2; ++k) {
+ snd_pcm_t *pcm = dsp->streams[k].pcm;
+ int err, count;
+ if (!pcm)
+ continue;
+ count = snd_pcm_poll_descriptors_count(pcm);
+ if (count < 0) {
+ errno = -count;
+ return -1;
+ }
+ err = snd_pcm_poll_descriptors(pcm, ufds, count);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ ufds += count;
+ }
+ return 0;
+}
+
+int lib_oss_pcm_poll_result(int fd, struct pollfd *ufds)
+{
+ oss_dsp_t *dsp = look_for_dsp(fd);
+ int k, result = 0;
+
+ if (dsp == NULL) {
+ errno = EBADFD;
+ return -1;
+ }
+ for (k = 0; k < 2; ++k) {
+ snd_pcm_t *pcm = dsp->streams[k].pcm;
+ int err, count;
+ unsigned short revents;
+ if (!pcm)
+ continue;
+ count = snd_pcm_poll_descriptors_count(pcm);
+ if (count < 0) {
+ errno = -count;
+ return -1;
+ }
+ err = snd_pcm_poll_descriptors_revents(pcm, ufds, count, &revents);
+ if (err < 0) {
+ errno = -err;
+ return -1;
+ }
+ if (revents & (POLLNVAL|POLLERR))
+ result |= OSS_WAIT_EVENT_ERROR;
+ if (revents & POLLIN)
+ result |= OSS_WAIT_EVENT_READ;
+ if (revents & POLLIN)
+ result |= OSS_WAIT_EVENT_WRITE;
+ ufds += count;
+ }
+ return result;
+}
+
+
static void error_handler(const char *file ATTRIBUTE_UNUSED,
int line ATTRIBUTE_UNUSED,
const char *func ATTRIBUTE_UNUSED,
-------------------------------------------------------
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
