diff options
| author | Lennart Poettering <lennart@poettering.net> | 2006-07-28 23:27:16 +0000 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2006-07-28 23:27:16 +0000 |
| commit | f1c46113ae4b0eedd291907d187f5ed39f29104d (patch) | |
| tree | 8b60e4b420d823561a5fded15730f82791f705ec /src/pulsecore/sink-input.h | |
| parent | 12aa8421747fa3448fb4dce6adafa198181cb4ac (diff) | |
fold the seperate variable pa_sink_input::playing into pa_sink_input::state as state PA_SINK_INPUT_DRAINED. The following mappings hold:
old PA_SINK_RUNNING + playing set = new PA_SINK_RUNNING
old PA_SINK_RUNNING + playing not set = new PA_SINK_DRAINED
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1162 fefdeb5f-60dc-0310-8127-8f9354f1896f
Diffstat (limited to 'src/pulsecore/sink-input.h')
| -rw-r--r-- | src/pulsecore/sink-input.h | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/pulsecore/sink-input.h b/src/pulsecore/sink-input.h index 69a7e50a..60105d31 100644 --- a/src/pulsecore/sink-input.h +++ b/src/pulsecore/sink-input.h @@ -34,9 +34,10 @@ typedef struct pa_sink_input pa_sink_input; #include <pulsecore/client.h> typedef enum pa_sink_input_state { - PA_SINK_INPUT_RUNNING, - PA_SINK_INPUT_CORKED, - PA_SINK_INPUT_DISCONNECTED + PA_SINK_INPUT_RUNNING, /*< The stream is alive and kicking */ + PA_SINK_INPUT_DRAINED, /*< The stream stopped playing because there was no data to play */ + PA_SINK_INPUT_CORKED, /*< The stream was corked on user request */ + PA_SINK_INPUT_DISCONNECTED /*< The stream is dead */ } pa_sink_input_state_t; struct pa_sink_input { @@ -63,8 +64,6 @@ struct pa_sink_input { void *userdata; - int playing; - pa_memchunk resampled_chunk; pa_resampler *resampler; }; |