Merge commit 'coling/master'

[pulseaudio] / src / pulse / simple.h

diff --git a/src/pulse/simple.h b/src/pulse/simple.h
index f76c1d67b8bc93f6421861389a56bf31d4bf72b2..3f57a6540868fe103bd82faec9aef77b00cac8af 100644 (file)
--- a/src/pulse/simple.h
+++ b/src/pulse/simple.h
@@ -1,8 +1,6 @@
 #ifndef foosimplehfoo
 #define foosimplehfoo
 
-/* $Id$ */
-
 /***
   This file is part of PulseAudio.
 
@@ -31,6 +29,7 @@
 #include <pulse/channelmap.h>
 #include <pulse/def.h>
 #include <pulse/cdecl.h>
+#include <pulse/version.h>
 
 /** \page simple Simple API
  *
@@ -130,18 +129,18 @@ pa_simple* pa_simple_new(
 void pa_simple_free(pa_simple *s);
 
 /** Write some data to the server */
-int pa_simple_write(pa_simple *s, const void*data, size_t length, int *error);
+int pa_simple_write(pa_simple *s, const void*data, size_t bytes, int *error);
 
 /** Wait until all data already written is played by the daemon */
 int pa_simple_drain(pa_simple *s, int *error);
 
 /** Read some data from the server */
-int pa_simple_read(pa_simple *s, void*data, size_t length, int *error);
+int pa_simple_read(pa_simple *s, void*data, size_t bytes, int *error);
 
-/** Return the playback latency. \since 0.5 */
+/** Return the playback latency. */
 pa_usec_t pa_simple_get_latency(pa_simple *s, int *error);
 
-/** Flush the playback buffer. \since 0.5 */
+/** Flush the playback buffer. */
 int pa_simple_flush(pa_simple *s, int *error);
 
 PA_C_DECL_END