pulse: get rid of redundant state variable
PATCH 3/6 pulse: get rid of redundant state variable
snd_pulse_t::state was mostly shadowing the state of pa_context_get_state(snd_pulse_t::context), so get rid of it and use the state of the context directly.
--- pulse/pulse.c | 14 +++----------- pulse/pulse.h | 6 ------ 2 files changed, 3 insertions(+), 17 deletions(-)
pulse/pulse.c +3 -11
@@ -59,12 +59,6 @@ int pulse_wait_operation(snd_pulse_t * p, pa_operation * o)assert (p);assert (o); -if (p->state !=PULSE_STATE_READY ) -return -EBADFD ; - -if (!p->mainloop) -return -EBADFD ; -for (;;) {int err;
@@ -124,8 +118,6 @@ snd_pulse_t *pulse_new(void)if (!p)return NULL ; - p->state =PULSE_STATE_INIT ; -if (pipe (fd)) {free (p);return NULL ;
@@ -192,13 +184,15 @@ void pulse_free(snd_pulse_t * p)int pulse_connect (snd_pulse_t * p,const char *server) {int err; +pa_context_state_t state;assert (p);if (!p->context || !p->mainloop)return -EBADFD ; -if (p->state !=PULSE_STATE_INIT ) + state =pa_context_get_state (p->context); +if (state !=PA_CONTEXT_UNCONNECTED )return -EBADFD ;pa_threaded_mainloop_lock (p->mainloop);
@@ -221,8 +215,6 @@ int pulse_connect(snd_pulse_t * p, const char *server)pa_threaded_mainloop_unlock (p->mainloop); - p->state =PULSE_STATE_READY ; -return 0 ; error:
pulse/pulse.h +0 -6
@@ -31,12 +31,6 @@ typedef struct snd_pulse {pa_context *context;int thread_fd, main_fd; - -enum { -PULSE_STATE_INIT , -PULSE_STATE_READY , - } state; - } snd_pulse_t;int pulse_check_connection (snd_pulse_t * p);
Signature · 10 lines
1.6.4 Lennart -- Lennart Poettering Red Hat, Inc. lennart [at] poettering [dot] net ICQ# 11060553 http://0pointer.net/lennart/ GnuPG 0x1A015CC4