[pulseaudio-discuss] [PATCH 5/5] simple: Enable pa_simple_flush() on record streams and amend documentation

Peter Meerwald pmeerw at pmeerw.net
Mon Dec 16 05:18:17 PST 2013


From: Peter Meerwald <p.meerwald at bct-electronic.com>

Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>
---
 src/pulse/simple.c |    2 --
 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 9b8d14b..1891131 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 ea2d0fb..54003ff 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
-- 
1.7.9.5



More information about the pulseaudio-discuss mailing list