diff options
| author | Peter Meerwald <p.meerwald@bct-electronic.com> | 2013-12-16 14:18:17 +0100 |
|---|---|---|
| committer | Tanu Kaskinen <tanu.kaskinen@linux.intel.com> | 2013-12-20 12:50:23 +0200 |
| commit | a247f7c58160bfd93039695cd7e60aa6108d53f4 (patch) | |
| tree | 071e72d30bad70799139290dd6df831a623349ab | |
| parent | 586324f0fce0cd89e764147271f7f66a21a2ed38 (diff) | |
simple: Enable pa_simple_flush() on record streams and amend documentation
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
| -rw-r--r-- | src/pulse/simple.c | 2 | ||||
| -rw-r--r-- | src/pulse/simple.h | 6 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/pulse/simple.c b/src/pulse/simple.c index 9b8d14bf7..18911316b 100644 --- a/src/pulse/simple.c +++ b/src/pulse/simple.c @@ -423,8 +423,6 @@ int pa_simple_flush(pa_simple *p, int *rerror) { pa_assert(p); - CHECK_VALIDITY_RETURN_ANY(rerror, p->direction == PA_STREAM_PLAYBACK, PA_ERR_BADSTATE, -1); - pa_threaded_mainloop_lock(p->mainloop); CHECK_DEAD_GOTO(p, rerror, unlock_and_fail); diff --git a/src/pulse/simple.h b/src/pulse/simple.h index ea2d0fb72..54003ffbc 100644 --- a/src/pulse/simple.h +++ b/src/pulse/simple.h @@ -80,11 +80,11 @@ * * \li pa_simple_get_latency() - Will return the total latency of * the playback or record pipeline, respectively. + * \li pa_simple_flush() - Will throw away all data currently in buffers. * - * If a playback stream is used then a few other operations are available: + * If a playback stream is used then the following operation is available: * * \li pa_simple_drain() - Will wait for all sent data to finish playing. - * \li pa_simple_flush() - Will throw away all data currently in buffers. * * \section cleanup_sec Cleanup * @@ -153,7 +153,7 @@ int pa_simple_read( /** Return the playback or record latency. */ pa_usec_t pa_simple_get_latency(pa_simple *s, int *error); -/** Flush the playback buffer. This discards any audio in the buffer. */ +/** Flush the playback or record buffer. This discards any audio in the buffer. */ int pa_simple_flush(pa_simple *s, int *error); PA_C_DECL_END |