summaryrefslogtreecommitdiff
path: root/src/pcm/pcm_shm.c
diff options
context:
space:
mode:
authorJaroslav Kysela <perex@perex.cz>2002-09-19 16:12:13 +0000
committerJaroslav Kysela <perex@perex.cz>2002-09-19 16:12:13 +0000
commit7f3942d827661d747b49d225e46ec4dccc5e5d46 (patch)
treeb8512a5972456ac997cc16a3cfbbe104925ec0d6 /src/pcm/pcm_shm.c
parentec415ef3a95f2ad4b5acf62cbe0afd8b5658feb4 (diff)
downloadalsa-lib-7f3942d827661d747b49d225e46ec4dccc5e5d46.tar.gz
Reverted back the PCM API.
New snd_pcm_hw_params_* functions are available only explicitly when ALSA_PCM_NEW_HW_PARAMS_API is defined. Updated documentation and test code to new API.
Diffstat (limited to 'src/pcm/pcm_shm.c')
-rw-r--r--src/pcm/pcm_shm.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/pcm/pcm_shm.c b/src/pcm/pcm_shm.c
index fe91afbd..824bb8b9 100644
--- a/src/pcm/pcm_shm.c
+++ b/src/pcm/pcm_shm.c
@@ -58,7 +58,7 @@ typedef struct {
#endif
#ifndef DOC_HIDDEN
-int receive_fd(int sock, void *data, size_t len, int *fd)
+int snd_receive_fd(int sock, void *data, size_t len, int *fd)
{
int ret;
size_t cmsg_len = CMSG_LEN(sizeof(int));
@@ -103,7 +103,7 @@ static long snd_pcm_shm_action_fd0(snd_pcm_t *pcm, int *fd)
err = write(shm->socket, buf, 1);
if (err != 1)
return -EBADFD;
- err = receive_fd(shm->socket, buf, 1, fd);
+ err = snd_receive_fd(shm->socket, buf, 1, fd);
if (err != 1)
return -EBADFD;
if (ctrl->cmd) {
@@ -192,7 +192,7 @@ static long snd_pcm_shm_action_fd(snd_pcm_t *pcm, int *fd)
err = write(shm->socket, buf, 1);
if (err != 1)
return -EBADFD;
- err = receive_fd(shm->socket, buf, 1, fd);
+ err = snd_receive_fd(shm->socket, buf, 1, fd);
if (err != 1)
return -EBADFD;
if (ctrl->cmd) {
@@ -794,7 +794,7 @@ int snd_pcm_shm_open(snd_pcm_t **pcmp, const char *name,
}
#ifndef DOC_HIDDEN
-int is_local(struct hostent *hent)
+int snd_is_local(struct hostent *hent)
{
int s;
int err;
@@ -984,7 +984,7 @@ int _snd_pcm_shm_open(snd_pcm_t **pcmp, const char *name,
SNDERR("Cannot resolve %s", host);
goto _err;
}
- local = is_local(h);
+ local = snd_is_local(h);
if (!local) {
SNDERR("%s is not the local host", host);
goto _err;