Update of /cvsroot/alsa/alsa-lib/src/pcm
In directory sc8-pr-cvs1:/tmp/cvs-serv30622/src/pcm
Modified Files:
pcm_dmix.c pcm_dmix_i386.h pcm_shm.c
Log Message:
Moved send_fd/receive_fd routines to src/socket.c .
Index: pcm_dmix.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix.c,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- pcm_dmix.c 18 Mar 2003 17:41:10 -0000 1.29
+++ pcm_dmix.c 18 Mar 2003 18:00:16 -0000 1.30
@@ -332,39 +332,6 @@
return sock;
}
-static int send_fd(int sock, void *data, size_t len, int fd)
-{
- int ret;
- size_t cmsg_len = CMSG_LEN(sizeof(int));
- struct cmsghdr *cmsg = alloca(cmsg_len);
- int *fds = (int *) CMSG_DATA(cmsg);
- struct msghdr msghdr;
- struct iovec vec;
-
- vec.iov_base = (void *)&data;
- vec.iov_len = len;
-
- cmsg->cmsg_len = cmsg_len;
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
- *fds = fd;
-
- msghdr.msg_name = NULL;
- msghdr.msg_namelen = 0;
- msghdr.msg_iov = &vec;
- msghdr.msg_iovlen = 1;
- msghdr.msg_control = cmsg;
- msghdr.msg_controllen = cmsg_len;
- msghdr.msg_flags = 0;
-
- ret = sendmsg(sock, &msghdr, 0 );
- if (ret < 0) {
- SYSERR("sendmsg failed");
- return -errno;
- }
- return ret;
-}
-
#if 0
#define server_printf(fmt, args...) printf(fmt, ##args)
#else
@@ -420,7 +387,7 @@
unsigned char buf = 'A';
pfds[current+1].fd = sck;
pfds[current+1].events = POLLIN | POLLERR |
POLLHUP;
- send_fd(sck, &buf, 1, dmix->hw_fd);
+ snd_send_fd(sck, &buf, 1, dmix->hw_fd);
server_printf("DMIX SERVER: fd sent ok\n");
current++;
}
@@ -509,8 +476,6 @@
/*
* client side
*/
-
-int snd_receive_fd(int sock, void *data, size_t len, int *fd);
static int client_connect(snd_pcm_dmix_t *dmix)
{
Index: pcm_dmix_i386.h
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_dmix_i386.h,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- pcm_dmix_i386.h 18 Mar 2003 14:15:21 -0000 1.6
+++ pcm_dmix_i386.h 18 Mar 2003 18:00:20 -0000 1.7
@@ -3,11 +3,11 @@
* \ingroup PCM_Plugins
* \brief PCM Direct Stream Mixing (dmix) Plugin Interface - I386 assembler code
* \author Jaroslav Kysela <[EMAIL PROTECTED]>
- * \date 2002
+ * \date 2003
*/
/*
* PCM - Direct Stream Mixing
- * Copyright (c) 2000 by Jaroslav Kysela <[EMAIL PROTECTED]>
+ * Copyright (c) 2003 by Jaroslav Kysela <[EMAIL PROTECTED]>
*
*
* This library is free software; you can redistribute it and/or modify
Index: pcm_shm.c
===================================================================
RCS file: /cvsroot/alsa/alsa-lib/src/pcm/pcm_shm.c,v
retrieving revision 1.56
retrieving revision 1.57
diff -u -r1.56 -r1.57
--- pcm_shm.c 22 Feb 2003 17:19:14 -0000 1.56
+++ pcm_shm.c 18 Mar 2003 18:00:21 -0000 1.57
@@ -57,42 +57,6 @@
} snd_pcm_shm_t;
#endif
-#ifndef DOC_HIDDEN
-int snd_receive_fd(int sock, void *data, size_t len, int *fd)
-{
- int ret;
- size_t cmsg_len = CMSG_LEN(sizeof(int));
- struct cmsghdr *cmsg = alloca(cmsg_len);
- int *fds = (int *) CMSG_DATA(cmsg);
- struct msghdr msghdr;
- struct iovec vec;
-
- vec.iov_base = (void *)&data;
- vec.iov_len = len;
-
- cmsg->cmsg_len = cmsg_len;
- cmsg->cmsg_level = SOL_SOCKET;
- cmsg->cmsg_type = SCM_RIGHTS;
- *fds = -1;
-
- msghdr.msg_name = NULL;
- msghdr.msg_namelen = 0;
- msghdr.msg_iov = &vec;
- msghdr.msg_iovlen = 1;
- msghdr.msg_control = cmsg;
- msghdr.msg_controllen = cmsg_len;
- msghdr.msg_flags = 0;
-
- ret = recvmsg(sock, &msghdr, 0);
- if (ret < 0) {
- SYSERR("recvmsg failed");
- return -errno;
- }
- *fd = *fds;
- return ret;
-}
-#endif
-
static long snd_pcm_shm_action_fd0(snd_pcm_t *pcm, int *fd)
{
snd_pcm_shm_t *shm = pcm->private_data;
-------------------------------------------------------
This SF.net email is sponsored by: Does your code think in ink?
You could win a Tablet PC. Get a free Tablet PC hat just for playing.
What are you waiting for?
http://ads.sourceforge.net/cgi-bin/redirect.pl?micr5043en
_______________________________________________
Alsa-cvslog mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/alsa-cvslog
