diff options
author | Lennart Poettering <mznyfn@0pointer.de> | 2009-08-04 23:54:24 +0200 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2009-08-04 23:58:17 +0200 |
commit | f74878bc610bccc4656f8194f29176cf9c956de9 (patch) | |
tree | a033e58eb4570012a5b313f2afea293132db8ebb /pulse/pulse.c | |
parent | 76d34749c05ba77614f648128ad7045681f547ae (diff) |
pulse: move a couple of PCM related functions from pulse.c to pcm_pulse.c
A number of functions in pulse.c are only relevant for the PCM handling,
so let's move them to pcm_pulse.c. This allows us to simplify their
argument lists a bit.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'pulse/pulse.c')
-rw-r--r-- | pulse/pulse.c | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/pulse/pulse.c b/pulse/pulse.c index 6f58a7e..c313182 100644 --- a/pulse/pulse.c +++ b/pulse/pulse.c @@ -44,26 +44,6 @@ int pulse_check_connection(snd_pulse_t * p) return 0; } -void pulse_stream_state_cb(pa_stream * s, void *userdata) -{ - snd_pulse_t *p = userdata; - - assert(s); - assert(p); - - pa_threaded_mainloop_signal(p->mainloop, 0); -} - -void pulse_stream_success_cb(pa_stream * s, int success, void *userdata) -{ - snd_pulse_t *p = userdata; - - assert(s); - assert(p); - - pa_threaded_mainloop_signal(p->mainloop, 0); -} - void pulse_context_success_cb(pa_context * c, int success, void *userdata) { snd_pulse_t *p = userdata; @@ -101,41 +81,6 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o) return 0; } -int pulse_wait_stream_state(snd_pulse_t * p, pa_stream * stream, - pa_stream_state_t target) -{ - pa_stream_state_t state; - - assert(p); - assert(stream); - - if (p->state != PULSE_STATE_READY) - return -EBADFD; - - if (!p->mainloop) - return -EBADFD; - - for (;;) { - int err; - - err = pulse_check_connection(p); - if (err < 0) - return err; - - state = pa_stream_get_state(stream); - - if (state == target) - break; - - if (!PA_STREAM_IS_GOOD(state)) - return -EIO; - - pa_threaded_mainloop_wait(p->mainloop); - } - - return 0; -} - static void context_state_cb(pa_context * c, void *userdata) { snd_pulse_t *p = userdata; |