diff options
| author | Lennart Poettering <lennart@poettering.net> | 2008-08-22 00:08:53 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2008-09-03 20:25:36 +0200 |
| commit | f5d1f3be98d95bec41f64d0568accddce8c2f212 (patch) | |
| tree | ce8523538cd66751d5d29d1647b6b16a6d62a9a6 /pulse | |
| parent | 4902e7a9e83d48398cd84b28e00daa837555b83e (diff) | |
Get rid of pulse_poll_revents()
pulse_poll_revents() has no real purpose, so let's remove it.
Diffstat (limited to 'pulse')
| -rw-r--r-- | pulse/ctl_pulse.c | 5 | ||||
| -rw-r--r-- | pulse/pcm_pulse.c | 5 | ||||
| -rw-r--r-- | pulse/pulse.c | 8 | ||||
| -rw-r--r-- | pulse/pulse.h | 3 |
4 files changed, 1 insertions, 20 deletions
diff --git a/pulse/ctl_pulse.c b/pulse/ctl_pulse.c index daffd3b..aa8c284 100644 --- a/pulse/ctl_pulse.c +++ b/pulse/ctl_pulse.c @@ -554,16 +554,11 @@ static int pulse_ctl_poll_revents(snd_ctl_ext_t * ext, struct pollfd *pfd, pa_threaded_mainloop_lock(ctl->p->mainloop); - err = pulse_poll_revents(ctl->p, pfd, nfds, revents); - if (err < 0) - goto finish; - *revents = 0; if (ctl->updated) *revents |= POLLIN; - finish: pa_threaded_mainloop_unlock(ctl->p->mainloop); return err; diff --git a/pulse/pcm_pulse.c b/pulse/pcm_pulse.c index 188641c..8d823b5 100644 --- a/pulse/pcm_pulse.c +++ b/pulse/pcm_pulse.c @@ -458,10 +458,6 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io, pa_threaded_mainloop_lock(pcm->p->mainloop); - err = pulse_poll_revents(pcm->p, pfd, nfds, revents); - if (err < 0) - goto finish; - *revents = 0; /* @@ -479,7 +475,6 @@ static int pulse_pcm_poll_revents(snd_pcm_ioplug_t * io, *revents |= POLLIN; } - finish: pa_threaded_mainloop_unlock(pcm->p->mainloop); return err; diff --git a/pulse/pulse.c b/pulse/pulse.c index 8e47b6c..5babcea 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -260,11 +260,3 @@ int pulse_poll_descriptors(snd_pulse_t * p, struct pollfd *pfd, return 1; } - -int pulse_poll_revents(snd_pulse_t * p, struct pollfd *pfd, - unsigned int nfds, unsigned short *revents) -{ - assert(p); - - return 1; -} diff --git a/pulse/pulse.h b/pulse/pulse.h index 9dd51a9..33723da 100644 --- a/pulse/pulse.h +++ b/pulse/pulse.h @@ -36,6 +36,7 @@ typedef struct snd_pulse { PULSE_STATE_INIT, PULSE_STATE_READY, } state; + } snd_pulse_t; int pulse_check_connection(snd_pulse_t * p); @@ -58,5 +59,3 @@ 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); -int pulse_poll_revents(snd_pulse_t * p, struct pollfd *pfd, - unsigned int nfds, unsigned short *revents); |