summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2008-09-03 20:13:48 +0200
committerLennart Poettering <lennart@poettering.net>2008-09-03 20:25:39 +0200
commit8ff77ce38c9be393217391d02ee0f49b12dc4a76 (patch)
tree9892c9d21492e398815caa0b7527436706ba9c41
parent6d9a4fe0f31b7752cfd31fcb02709cb695189dc6 (diff)
Remove our own poll handler implementation entirely
Neither pcm_pulse.c nor ctl_pulse.c is using our poll handler implementation anymore, so let's get rid of the common parts previously used by them, too
-rw-r--r--pulse/pulse.c24
-rw-r--r--pulse/pulse.h3
2 files changed, 0 insertions, 27 deletions
diff --git a/pulse/pulse.c b/pulse/pulse.c
index 7bf0c7a..617851e 100644
--- a/pulse/pulse.c
+++ b/pulse/pulse.c
@@ -287,27 +287,3 @@ void pulse_poll_deactivate(snd_pulse_t * p)
/* Drain the pipe */
while (read(p->main_fd, buf, sizeof(buf)) > 0);
}
-
-int pulse_poll_descriptors_count(snd_pulse_t * p)
-{
- assert(p);
-
- if (p->main_fd >= 0)
- return 1;
- else
- return 0;
-}
-
-int pulse_poll_descriptors(snd_pulse_t * p, struct pollfd *pfd,
- unsigned int space)
-{
- assert(p);
-
- assert(space >= 1);
-
- pfd[0].fd = p->main_fd;
- pfd[0].events = POLLIN;
- pfd[0].revents = 0;
-
- return 1;
-}
diff --git a/pulse/pulse.h b/pulse/pulse.h
index 33723da..7bf1a5b 100644
--- a/pulse/pulse.h
+++ b/pulse/pulse.h
@@ -56,6 +56,3 @@ int pulse_connect(snd_pulse_t * p, const char *server);
void pulse_poll_activate(snd_pulse_t * p);
void pulse_poll_deactivate(snd_pulse_t * p);
-int pulse_poll_descriptors_count(snd_pulse_t * p);
-int pulse_poll_descriptors(snd_pulse_t * p, struct pollfd *pfd,
- unsigned int space);