diff options
author | Marc-André Lureau <marcandre.lureau@gmail.com> | 2009-01-15 17:16:31 +0200 |
---|---|---|
committer | Marc-André Lureau <marcandre.lureau@gmail.com> | 2009-01-20 00:16:18 +0200 |
commit | 9c4f8e627a70fc610a81da2703eeddfde4a7e4fa (patch) | |
tree | 8b8096c7505eb452ffa270116db742eecaca8972 /src/pulsecore | |
parent | f83111dd1710d7e0a3240879217e6d0c783c4a4b (diff) |
pulse: introspect sink state
Diffstat (limited to 'src/pulsecore')
-rw-r--r-- | src/pulsecore/protocol-native.c | 12 | ||||
-rw-r--r-- | src/pulsecore/sink.h | 19 | ||||
-rw-r--r-- | src/pulsecore/source.h | 20 |
3 files changed, 28 insertions, 23 deletions
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c index eb555050..a49d5dfb 100644 --- a/src/pulsecore/protocol-native.c +++ b/src/pulsecore/protocol-native.c @@ -2679,8 +2679,12 @@ static void sink_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_sin pa_tagstruct_put_usec(t, pa_sink_get_requested_latency(sink)); } - if (c->version >= 15) + if (c->version >= 15) { pa_tagstruct_put_volume(t, sink->base_volume); + if (PA_UNLIKELY(pa_sink_get_state(sink) == PA_SINK_INVALID_STATE)) + pa_log_error("Internal sink state is invalid."); + pa_tagstruct_putu32(t, pa_sink_get_state(sink)); + } } static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_source *source) { @@ -2713,8 +2717,12 @@ static void source_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_s pa_tagstruct_put_usec(t, pa_source_get_requested_latency(source)); } - if (c->version >= 15) + if (c->version >= 15) { pa_tagstruct_put_volume(t, source->base_volume); + if (PA_UNLIKELY(pa_source_get_state(source) == PA_SOURCE_INVALID_STATE)) + pa_log_error("Internal source state is invalid."); + pa_tagstruct_putu32(t, pa_source_get_state(source)); + } } static void client_fill_tagstruct(pa_native_connection *c, pa_tagstruct *t, pa_client *client) { diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index 507c1603..382b2d0e 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -27,6 +27,7 @@ typedef struct pa_sink pa_sink; #include <inttypes.h> +#include <pulse/def.h> #include <pulse/sample.h> #include <pulse/channelmap.h> #include <pulse/volume.h> @@ -42,18 +43,16 @@ typedef struct pa_sink pa_sink; #define PA_MAX_INPUTS_PER_SINK 32 -typedef enum pa_sink_state { - PA_SINK_INIT, - PA_SINK_RUNNING, - PA_SINK_SUSPENDED, - PA_SINK_IDLE, - PA_SINK_UNLINKED -} pa_sink_state_t; +/* anonymous enum extending pa_sink_state_t */ +enum { + PA_SINK_INIT = -2, + /* Initialization state */ -static inline pa_bool_t PA_SINK_IS_OPENED(pa_sink_state_t x) { - return x == PA_SINK_RUNNING || x == PA_SINK_IDLE; -} + PA_SINK_UNLINKED = -3 + /* The state when the sink is getting unregistered and removed from client access */ +}; +/* Returns true if sink is linked: registered and accessible from client side. */ static inline pa_bool_t PA_SINK_IS_LINKED(pa_sink_state_t x) { return x == PA_SINK_RUNNING || x == PA_SINK_IDLE || x == PA_SINK_SUSPENDED; } diff --git a/src/pulsecore/source.h b/src/pulsecore/source.h index 48240996..369da435 100644 --- a/src/pulsecore/source.h +++ b/src/pulsecore/source.h @@ -45,18 +45,16 @@ typedef struct pa_source pa_source; #define PA_MAX_OUTPUTS_PER_SOURCE 32 -typedef enum pa_source_state { - PA_SOURCE_INIT, - PA_SOURCE_RUNNING, - PA_SOURCE_SUSPENDED, - PA_SOURCE_IDLE, - PA_SOURCE_UNLINKED -} pa_source_state_t; - -static inline pa_bool_t PA_SOURCE_IS_OPENED(pa_source_state_t x) { - return x == PA_SOURCE_RUNNING || x == PA_SOURCE_IDLE; -} +/* anonymous enum extending pa_source_state_t */ +enum { + PA_SOURCE_INIT = -2, + /* Initialization state */ + + PA_SOURCE_UNLINKED = -3 + /* The state when the source is getting unregistered and removed from client access */ +}; +/* Returns true if source is linked: registered and accessible from client side. */ static inline pa_bool_t PA_SOURCE_IS_LINKED(pa_source_state_t x) { return x == PA_SOURCE_RUNNING || x == PA_SOURCE_IDLE || x == PA_SOURCE_SUSPENDED; } |