From 310f433848b21a53def0a5a5ca0b3b2e6a2008ef Mon Sep 17 00:00:00 2001 From: Marc-André Lureau Date: Fri, 16 Jan 2009 15:53:27 +0200 Subject: pulse: share private enum values with client side --- src/pulse/def.h | 20 ++++++++++++++++++-- src/pulsecore/sink.h | 9 --------- src/pulsecore/source.h | 9 --------- 3 files changed, 18 insertions(+), 20 deletions(-) (limited to 'src') diff --git a/src/pulse/def.h b/src/pulse/def.h index 7dc753f9..8e8857c1 100644 --- a/src/pulse/def.h +++ b/src/pulse/def.h @@ -624,9 +624,17 @@ typedef enum pa_sink_state { /* enum serialized in u8 */ PA_SINK_IDLE = 1, /**< When idle, the sink is playing but there is no non-corked sink-input attached to it \since 0.9.15 */ - PA_SINK_SUSPENDED = 2 + PA_SINK_SUSPENDED = 2, /**< When suspended, actual sink access can be closed, for instance \since 0.9.15 */ + /* *** PRIVATE: server-side values *** */ + + PA_SINK_INIT = -2, + /* Initialization state */ + + PA_SINK_UNLINKED = -3 + /* The state when the sink is getting unregistered and removed from client access */ + } pa_sink_state_t; /** Returns non-zero if sink is playing: running or idle. \since 0.9.15 */ @@ -685,9 +693,17 @@ typedef enum pa_source_state { PA_SOURCE_IDLE = 1, /**< When idle, the source is still recording but there is no non-corked source-output \since 0.9.15 */ - PA_SOURCE_SUSPENDED = 2 + PA_SOURCE_SUSPENDED = 2, /**< When suspended, actual source access can be closed, for instance \since 0.9.15 */ + /* *** PRIVATE: server-side values *** */ + + PA_SOURCE_INIT = -2, + /* Initialization state */ + + PA_SOURCE_UNLINKED = -3 + /* The state when the source is getting unregistered and removed from client access */ + } pa_source_state_t; /** Returns non-zero if source is recording: running or idle. \since 0.9.15 */ diff --git a/src/pulsecore/sink.h b/src/pulsecore/sink.h index 382b2d0e..89ed6d4d 100644 --- a/src/pulsecore/sink.h +++ b/src/pulsecore/sink.h @@ -43,15 +43,6 @@ typedef struct pa_sink pa_sink; #define PA_MAX_INPUTS_PER_SINK 32 -/* anonymous enum extending pa_sink_state_t */ -enum { - PA_SINK_INIT = -2, - /* Initialization state */ - - 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 369da435..336599d6 100644 --- a/src/pulsecore/source.h +++ b/src/pulsecore/source.h @@ -45,15 +45,6 @@ typedef struct pa_source pa_source; #define PA_MAX_OUTPUTS_PER_SOURCE 32 -/* 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; -- cgit