[pulseaudio-commits] 16 commits - po/as.po po/bn_IN.po po/ca.po po/cs.po po/de_CH.po po/de.po po/el.po po/es.po po/fi.po po/fr.po po/gu.po po/he.po po/hi.po po/hu.po po/it.po po/ja.po po/kn.po po/ml.po po/mr.po po/nl.po po/or.po po/pa.po po/pl.po po/pt_BR.po po/pt.po po/ru.po po/sr at latin.po po/sr.po po/sv.po po/ta.po po/te.po po/uk.po po/zh_CN.po po/zh_TW.po src/modules src/pulse src/pulsecore
Colin Guthrie
colin at kemper.freedesktop.org
Mon Dec 12 15:57:43 PST 2011
po/as.po | 2
po/bn_IN.po | 2
po/ca.po | 2
po/cs.po | 2
po/de.po | 2
po/de_CH.po | 2
po/el.po | 2
po/es.po | 2
po/fi.po | 2
po/fr.po | 2
po/gu.po | 2
po/he.po | 2
po/hi.po | 2
po/hu.po | 2
po/it.po | 2
po/ja.po | 2
po/kn.po | 2
po/ml.po | 2
po/mr.po | 2
po/nl.po | 2
po/or.po | 2
po/pa.po | 2
po/pl.po | 2
po/pt.po | 2
po/pt_BR.po | 2
po/ru.po | 2
po/sr.po | 2
po/sr at latin.po | 2
po/sv.po | 2
po/ta.po | 2
po/te.po | 2
po/uk.po | 2
po/zh_CN.po | 2
po/zh_TW.po | 2
src/modules/module-tunnel.c | 4
src/pulse/context.c | 4
src/pulse/def.h | 2
src/pulse/error.c | 2
src/pulse/format.h | 11 +-
src/pulse/introspect.h | 4
src/pulse/proplist.h | 21 ++--
src/pulse/simple.h | 26 ++---
src/pulse/stream.c | 6 -
src/pulse/stream.h | 203 ++++++++++++++++++++--------------------
src/pulse/thread-mainloop.h | 31 +++---
src/pulse/utf8.h | 2
src/pulsecore/protocol-native.c | 4
src/pulsecore/pstream.c | 52 +++++-----
src/pulsecore/pstream.h | 4
49 files changed, 230 insertions(+), 214 deletions(-)
New commits:
commit 8942d2369d25b9336661eeaf25ebabc070db57e8
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 19:50:38 2011 +0100
stream: Fix typos and formatting in stream.h doxygen documentation
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 622b4d6..0422cc9 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -292,13 +292,13 @@
* To synchronize a stream to another, just pass the "master" stream
* as last argument to pa_stream_connect_playback(). To make sure that
* the freshly created stream doesn't start playback right-away, make
- * sure to pass PA_STREAM_START_CORKED and - after all streams have
- * been created - uncork them all with a single call to
+ * sure to pass PA_STREAM_START_CORKED and -- after all streams have
+ * been created -- uncork them all with a single call to
* pa_stream_cork() for the master stream.
*
* To make sure that a particular stream doesn't stop to play when a
* server side buffer underrun happens on it while the other
- * synchronized streams continue playing and hence deviate you need to
+ * synchronized streams continue playing and hence deviate, you need to
* pass a "prebuf" pa_buffer_attr of 0 when connecting it.
*
* \section disc_sec Disconnecting
@@ -348,7 +348,7 @@ pa_stream* pa_stream_new(
const pa_channel_map *map /**< The desired channel map, or NULL for default */);
/** Create a new, unconnected stream with the specified name and
- * sample type, and specify the the initial stream property
+ * sample type, and specify the initial stream property
* list. \since 0.9.11 */
pa_stream* pa_stream_new_with_proplist(
pa_context *c /**< The context to create this stream in */,
@@ -368,67 +368,71 @@ pa_stream *pa_stream_new_extended(
unsigned int n_formats /**< The number of formats being passed in */,
pa_proplist *p /**< The initial property list */);
-/** Decrease the reference counter by one */
+/** Decrease the reference counter by one. */
void pa_stream_unref(pa_stream *s);
-/** Increase the reference counter by one */
+/** Increase the reference counter by one. */
pa_stream *pa_stream_ref(pa_stream *s);
-/** Return the current state of the stream */
+/** Return the current state of the stream. */
pa_stream_state_t pa_stream_get_state(pa_stream *p);
-/** Return the context this stream is attached to */
+/** Return the context this stream is attached to. */
pa_context* pa_stream_get_context(pa_stream *p);
-/** Return the sink input resp. source output index this stream is
- * identified in the server with. This is useful for usage with the
- * introspection functions, such as pa_context_get_sink_input_info()
- * resp. pa_context_get_source_output_info(). */
+/** Return the sink input resp.\ source output index this stream is
+ * identified in the server with. This is useful with the
+ * introspection functions such as pa_context_get_sink_input_info()
+ * or pa_context_get_source_output_info(). */
uint32_t pa_stream_get_index(pa_stream *s);
/** Return the index of the sink or source this stream is connected to
- * in the server. This is useful for usage with the introspection
- * functions, such as pa_context_get_sink_info_by_index()
- * resp. pa_context_get_source_info_by_index(). Please note that
- * streams may be moved between sinks/sources and thus it is
- * recommended to use pa_stream_set_moved_callback() to be notified
+ * in the server. This is useful with the introspection
+ * functions such as pa_context_get_sink_info_by_index() or
+ * pa_context_get_source_info_by_index().
+ *
+ * Please note that streams may be moved between sinks/sources and thus
+ * it is recommended to use pa_stream_set_moved_callback() to be notified
* about this. This function will return with PA_ERR_NOTSUPPORTED when the
* server is older than 0.9.8. \since 0.9.8 */
uint32_t pa_stream_get_device_index(pa_stream *s);
/** Return the name of the sink or source this stream is connected to
- * in the server. This is useful for usage with the introspection
- * functions, such as pa_context_get_sink_info_by_name()
- * resp. pa_context_get_source_info_by_name(). Please note that
- * streams may be moved between sinks/sources and thus it is
- * recommended to use pa_stream_set_moved_callback() to be notified
+ * in the server. This is useful with the introspection
+ * functions such as pa_context_get_sink_info_by_name()
+ * or pa_context_get_source_info_by_name().
+ *
+ * Please note that streams may be moved between sinks/sources and thus
+ * it is recommended to use pa_stream_set_moved_callback() to be notified
* about this. This function will return with PA_ERR_NOTSUPPORTED when the
* server is older than 0.9.8. \since 0.9.8 */
const char *pa_stream_get_device_name(pa_stream *s);
/** Return 1 if the sink or source this stream is connected to has
- * been suspended. This will return 0 if not, and negative on
+ * been suspended. This will return 0 if not, and a negative value on
* error. This function will return with PA_ERR_NOTSUPPORTED when the
* server is older than 0.9.8. \since 0.9.8 */
int pa_stream_is_suspended(pa_stream *s);
/** Return 1 if the this stream has been corked. This will return 0 if
- * not, and negative on error. \since 0.9.11 */
+ * not, and a negative value on error. \since 0.9.11 */
int pa_stream_is_corked(pa_stream *s);
/** Connect the stream to a sink. It is strongly recommended to pass
- * NULL in both dev and volume and not to set either
+ * NULL in both \a dev and \a volume and not to set either
* PA_STREAM_START_MUTED nor PA_STREAM_START_UNMUTED -- unless these
- * options are directly dependent on user input or configuration. If
- * you follow this rule then the sound server will have the full
+ * options are directly dependent on user input or configuration.
+ *
+ * If you follow this rule then the sound server will have the full
* flexibility to choose the device, volume and mute status
* automatically, based on server-side policies, heuristics and stored
* information from previous uses. Also the server may choose to
* reconfigure audio devices to make other sinks/sources or
- * capabilities available to be able to accept the stream. Before
- * 0.9.20 it was not defined whether the 'volume' parameter was
+ * capabilities available to be able to accept the stream.
+ *
+ * Before 0.9.20 it was not defined whether the \a volume parameter was
* interpreted relative to the sink's current volume or treated as
- * absolute device volume. Since 0.9.20 it is an absolute volume when
+ * an absolute device volume. Since 0.9.20 it is an absolute volume when
* the sink is in flat volume mode, and relative otherwise, thus
* making sure the volume passed here has always the same semantics as
* the volume passed to pa_context_set_sink_input_volume(). */
@@ -438,38 +442,42 @@ int pa_stream_connect_playback(
const pa_buffer_attr *attr /**< Buffering attributes, or NULL for default */,
pa_stream_flags_t flags /**< Additional flags, or 0 for default */,
const pa_cvolume *volume /**< Initial volume, or NULL for default */,
- pa_stream *sync_stream /**< Synchronize this stream with the specified one, or NULL for a standalone stream*/);
+ pa_stream *sync_stream /**< Synchronize this stream with the specified one, or NULL for a standalone stream */);
-/** Connect the stream to a source */
+/** Connect the stream to a source. */
int pa_stream_connect_record(
pa_stream *s /**< The stream to connect to a source */ ,
const char *dev /**< Name of the source to connect to, or NULL for default */,
const pa_buffer_attr *attr /**< Buffer attributes, or NULL for default */,
pa_stream_flags_t flags /**< Additional flags, or 0 for default */);
-/** Disconnect a stream from a source/sink */
+/** Disconnect a stream from a source/sink. */
int pa_stream_disconnect(pa_stream *s);
/** Prepare writing data to the server (for playback streams). This
* function may be used to optimize the number of memory copies when
* doing playback ("zero-copy"). It is recommended to call this
- * function before each call to pa_stream_write(). Pass in the address
- * to a pointer and an address of the number of bytes you want to
- * write. On return the two values will contain a pointer where you
- * can place the data to write and the maximum number of bytes you can
- * write. On return *nbytes can be smaller or have the same value as
- * you passed in. You need to be able to handle both cases. Accessing
- * memory beyond the returned *nbytes value is invalid. Accessing the
- * memory returned after the following pa_stream_write() or
- * pa_stream_cancel_write() is invalid. On invocation only *nbytes
- * needs to be initialized, on return both *data and *nbytes will be
- * valid. If you place (size_t) -1 in *nbytes on invocation the memory
- * size will be chosen automatically (which is recommended to
- * do). After placing your data in the memory area returned call
- * pa_stream_write() with data set to an address within this memory
- * area and an nbytes value that is smaller or equal to what was
- * returned by this function to actually execute the write. An
- * invocation of pa_stream_write() should follow "quickly" on
+ * function before each call to pa_stream_write().
+ *
+ * Pass in the address to a pointer and an address of the number of
+ * bytes you want to write. On return the two values will contain a
+ * pointer where you can place the data to write and the maximum number
+ * of bytes you can write. \a *nbytes can be smaller or have the same
+ * value as you passed in. You need to be able to handle both cases.
+ * Accessing memory beyond the returned \a *nbytes value is invalid.
+ * Accessing the memory returned after the following pa_stream_write()
+ * or pa_stream_cancel_write() is invalid.
+ *
+ * On invocation only \a *nbytes needs to be initialized, on return both
+ * *data and *nbytes will be valid. If you place (size_t) -1 in *nbytes
+ * on invocation the memory size will be chosen automatically (which is
+ * recommended to do). After placing your data in the memory area
+ * returned, call pa_stream_write() with \a data set to an address
+ * within this memory area and an \a nbytes value that is smaller or
+ * equal to what was returned by this function to actually execute the
+ * write.
+ *
+ * An invocation of pa_stream_write() should follow "quickly" on
* pa_stream_begin_write(). It is not recommended letting an unbounded
* amount of time pass after calling pa_stream_begin_write() and
* before calling pa_stream_write(). If you want to cancel a
@@ -477,7 +485,7 @@ int pa_stream_disconnect(pa_stream *s);
* pa_stream_write() use pa_stream_cancel_write(). Calling
* pa_stream_begin_write() twice without calling pa_stream_write() or
* pa_stream_cancel_write() in between will return exactly the same
- * pointer/nbytes values.\since 0.9.16 */
+ * \a data pointer and \a nbytes values. \since 0.9.16 */
int pa_stream_begin_write(
pa_stream *p,
void **data,
@@ -495,15 +503,17 @@ int pa_stream_begin_write(
int pa_stream_cancel_write(
pa_stream *p);
-/** Write some data to the server (for playback streams), if free_cb
- * is non-NULL this routine is called when all data has been written
- * out and an internal reference to the specified data is kept, the
- * data is not copied. If NULL, the data is copied into an internal
- * buffer. The client may freely seek around in the output buffer. For
- * most applications passing 0 and PA_SEEK_RELATIVE as arguments for
- * offset and seek should be useful. After the write call succeeded
- * the write index will be at the position after where this chunk of
- * data has been written to.
+/** Write some data to the server (for playback streams).
+ * If \a free_cb is non-NULL this routine is called when all data has
+ * been written out. An internal reference to the specified data is
+ * kept, the data is not copied. If NULL, the data is copied into an
+ * internal buffer.
+ *
+ * The client may freely seek around in the output buffer. For
+ * most applications it is typical to pass 0 and PA_SEEK_RELATIVE
+ * as values for the arguments \a offset and \a seek. After the write
+ * call succeeded the write index will be at the position after where
+ * this chunk of data has been written to.
*
* As an optimization for avoiding needless memory copies you may call
* pa_stream_begin_write() before this call and then place your audio
@@ -518,17 +528,17 @@ int pa_stream_cancel_write(
int pa_stream_write(
pa_stream *p /**< The stream to use */,
const void *data /**< The data to write */,
- size_t nbytes /**< The length of the data to write in bytes*/,
+ size_t nbytes /**< The length of the data to write in bytes */,
pa_free_cb_t free_cb /**< A cleanup routine for the data or NULL to request an internal copy */,
int64_t offset, /**< Offset for seeking, must be 0 for upload streams */
pa_seek_mode_t seek /**< Seek mode, must be PA_SEEK_RELATIVE for upload streams */);
/** Read the next fragment from the buffer (for recording streams).
- * data will point to the actual data and nbytes will contain the size
+ * \a data will point to the actual data and \a nbytes will contain the size
* of the data in bytes (which can be less or more than a complete
- * fragment). Use pa_stream_drop() to actually remove the data from
+ * fragment). Use pa_stream_drop() to actually remove the data from
* the buffer. If no data is available this will return a NULL
- * pointer */
+ * pointer. */
int pa_stream_peek(
pa_stream *p /**< The stream to use */,
const void **data /**< Pointer to pointer that will point to data */,
@@ -538,10 +548,10 @@ int pa_stream_peek(
* calling pa_stream_peek(). */
int pa_stream_drop(pa_stream *p);
-/** Return the number of bytes that may be written using pa_stream_write() */
+/** Return the number of bytes that may be written using pa_stream_write(). */
size_t pa_stream_writable_size(pa_stream *p);
-/** Return the number of bytes that may be read using pa_stream_peek()*/
+/** Return the number of bytes that may be read using pa_stream_peek(). */
size_t pa_stream_readable_size(pa_stream *p);
/** Drain a playback stream. Use this for notification when the
@@ -556,15 +566,14 @@ pa_operation* pa_stream_drain(pa_stream *s, pa_stream_success_cb_t cb, void *use
* up values. */
pa_operation* pa_stream_update_timing_info(pa_stream *p, pa_stream_success_cb_t cb, void *userdata);
-/** Set the callback function that is called whenever the state of the stream changes */
+/** Set the callback function that is called whenever the state of the stream changes. */
void pa_stream_set_state_callback(pa_stream *s, pa_stream_notify_cb_t cb, void *userdata);
/** Set the callback function that is called when new data may be
* written to the stream. */
void pa_stream_set_write_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
-/** Set the callback function that is called when new data is available from the stream.
- * Return the number of bytes read.*/
+/** Set the callback function that is called when new data is available from the stream. */
void pa_stream_set_read_callback(pa_stream *p, pa_stream_request_cb_t cb, void *userdata);
/** Set the callback function that is called when a buffer overflow happens. (Only for playback streams) */
@@ -582,7 +591,7 @@ void pa_stream_set_underflow_callback(pa_stream *p, pa_stream_notify_cb_t cb, vo
/** Set the callback function that is called when a the server starts
* playback after an underrun or on initial startup. This only informs
* that audio is flowing again, it is no indication that audio started
- * to reach the speakers already. (Only for playback streams). \since
+ * to reach the speakers already. (Only for playback streams) \since
* 0.9.11 */
void pa_stream_set_started_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
@@ -592,7 +601,7 @@ void pa_stream_set_started_callback(pa_stream *p, pa_stream_notify_cb_t cb, void
void pa_stream_set_latency_update_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
/** Set the callback function that is called whenever the stream is
- * moved to a different sink/source. Use pa_stream_get_device_name()or
+ * moved to a different sink/source. Use pa_stream_get_device_name() or
* pa_stream_get_device_index() to query the new sink/source. This
* notification is only generated when the server is at least
* 0.9.8. \since 0.9.8 */
@@ -603,13 +612,13 @@ void pa_stream_set_moved_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *
* pa_stream_is_suspended() to query the new suspend status. Please
* note that the suspend status might also change when the stream is
* moved between devices. Thus if you call this function you very
- * likely want to call pa_stream_set_moved_callback, too. This
+ * likely want to call pa_stream_set_moved_callback() too. This
* notification is only generated when the server is at least
* 0.9.8. \since 0.9.8 */
void pa_stream_set_suspended_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
/** Set the callback function that is called whenever a meta/policy
- * control event is received.\since 0.9.15 */
+ * control event is received. \since 0.9.15 */
void pa_stream_set_event_callback(pa_stream *p, pa_stream_event_cb_t cb, void *userdata);
/** Set the callback function that is called whenever the buffer
@@ -620,30 +629,30 @@ void pa_stream_set_event_callback(pa_stream *p, pa_stream_event_cb_t cb, void *u
void pa_stream_set_buffer_attr_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
/** Pause (or resume) playback of this stream temporarily. Available
- * on both playback and recording streams. If b is 1 the stream is
- * paused. If b is 0 the stream is resumed. The pause/resume operation
+ * on both playback and recording streams. If \a b is 1 the stream is
+ * paused. If \a b is 0 the stream is resumed. The pause/resume operation
* is executed as quickly as possible. If a cork is very quickly
- * followed by an uncork or the other way round this might not
+ * followed by an uncork or the other way round, this might not
* actually have any effect on the stream that is output. You can use
* pa_stream_is_corked() to find out whether the stream is currently
* paused or not. Normally a stream will be created in uncorked
- * state. If you pass PA_STREAM_START_CORKED as flag during connection
- * of the stream it will be created in corked state. */
+ * state. If you pass PA_STREAM_START_CORKED as a flag when connecting
+ * the stream, it will be created in corked state. */
pa_operation* pa_stream_cork(pa_stream *s, int b, pa_stream_success_cb_t cb, void *userdata);
-/** Flush the playback buffer of this stream. This discards any audio
+/** Flush the playback buffer of this stream. This discards any audio data
* in the buffer. Most of the time you're better off using the parameter
* delta of pa_stream_write() instead of this function. Available on both
* playback and recording streams. */
pa_operation* pa_stream_flush(pa_stream *s, pa_stream_success_cb_t cb, void *userdata);
-/** Reenable prebuffering as specified in the pa_buffer_attr
+/** Reenable prebuffering if specified in the pa_buffer_attr
* structure. Available for playback streams only. */
pa_operation* pa_stream_prebuf(pa_stream *s, pa_stream_success_cb_t cb, void *userdata);
/** Request immediate start of playback on this stream. This disables
- * prebuffering as specified in the pa_buffer_attr structure,
- * temporarily. Available for playback streams only. */
+ * prebuffering temporarily if specified in the pa_buffer_attr structure.
+ * Available for playback streams only. */
pa_operation* pa_stream_trigger(pa_stream *s, pa_stream_success_cb_t cb, void *userdata);
/** Rename the stream. */
@@ -661,20 +670,20 @@ pa_operation* pa_stream_set_name(pa_stream *s, const char *name, pa_stream_succe
* the timing info structure has been acquired.
*
* The time value returned by this function is guaranteed to increase
- * monotonically. (that means: the returned value is always greater
- * or equal to the value returned on the last call). This behaviour
+ * monotonically (the returned value is always greater
+ * or equal to the value returned by the last call). This behaviour
* can be disabled by using PA_STREAM_NOT_MONOTONIC. This may be
- * desirable to deal better with bad estimations of transport
+ * desirable to better deal with bad estimations of transport
* latencies, but may have strange effects if the application is not
* able to deal with time going 'backwards'.
*
* The time interpolator activated by PA_STREAM_INTERPOLATE_TIMING
* favours 'smooth' time graphs over accurate ones to improve the
* smoothness of UI operations that are tied to the audio clock. If
- * accuracy is more important to you you might need to estimate your
+ * accuracy is more important to you, you might need to estimate your
* timing based on the data from pa_stream_get_timing_info() yourself
* or not work with interpolated timing at all and instead always
- * query on the server side for the most up to date timing with
+ * query the server side for the most up to date timing with
* pa_stream_update_timing_info().
*
* If no timing information has been
@@ -687,15 +696,15 @@ int pa_stream_get_time(pa_stream *s, pa_usec_t *r_usec);
*
* In case the stream is a monitoring stream the result can be
* negative, i.e. the captured samples are not yet played. In this
- * case *negative is set to 1.
+ * case \a *negative is set to 1.
*
- * If no timing information has been received yet this call will
+ * If no timing information has been received yet, this call will
* return PA_ERR_NODATA. For more details see
* pa_stream_get_timing_info() and pa_stream_get_time(). */
int pa_stream_get_latency(pa_stream *s, pa_usec_t *r_usec, int *negative);
/** Return the latest raw timing data structure. The returned pointer
- * points to an internal read-only instance of the timing
+ * refers to an internal read-only instance of the timing
* structure. The user should make a copy of this structure if he
* wants to modify it. An in-place update to this data structure may
* be requested using pa_stream_update_timing_info().
@@ -716,7 +725,7 @@ const pa_sample_spec* pa_stream_get_sample_spec(pa_stream *s);
/** Return a pointer to the stream's channel map. */
const pa_channel_map* pa_stream_get_channel_map(pa_stream *s);
-/** Return a pointer to the stream's format \since 1.0 */
+/** Return a pointer to the stream's format. \since 1.0 */
const pa_format_info* pa_stream_get_format_info(pa_stream *s);
/** Return the per-stream server-side buffer metrics of the
@@ -725,7 +734,7 @@ const pa_format_info* pa_stream_get_format_info(pa_stream *s);
* actual configured buffering metrics, which may differ from what was
* requested during pa_stream_connect_record() or
* pa_stream_connect_playback(). This call will always return the
- * actually per-stream server-side buffer metrics, regardless whether
+ * actual per-stream server-side buffer metrics, regardless whether
* PA_STREAM_ADJUST_LATENCY is set or not. \since 0.9.0 */
const pa_buffer_attr* pa_stream_get_buffer_attr(pa_stream *s);
@@ -741,16 +750,16 @@ pa_operation *pa_stream_set_buffer_attr(pa_stream *s, const pa_buffer_attr *attr
/** Change the stream sampling rate during playback. You need to pass
* PA_STREAM_VARIABLE_RATE in the flags parameter of
- * pa_stream_connect_...() if you plan to use this function. Only valid
+ * pa_stream_connect_playback() if you plan to use this function. Only valid
* after the stream has been connected successfully and if the server
* is at least PulseAudio 0.9.8. \since 0.9.8 */
pa_operation *pa_stream_update_sample_rate(pa_stream *s, uint32_t rate, pa_stream_success_cb_t cb, void *userdata);
/** Update the property list of the sink input/source output of this
* stream, adding new entries. Please note that it is highly
- * recommended to set as much properties initially via
+ * recommended to set as many properties initially via
* pa_stream_new_with_proplist() as possible instead a posteriori with
- * this function, since that information may then be used to route
+ * this function, since that information may be used to route
* this stream to the right device. \since 0.9.11 */
pa_operation *pa_stream_proplist_update(pa_stream *s, pa_update_mode_t mode, pa_proplist *p, pa_stream_success_cb_t cb, void *userdata);
@@ -759,7 +768,7 @@ pa_operation *pa_stream_proplist_update(pa_stream *s, pa_update_mode_t mode, pa_
pa_operation *pa_stream_proplist_remove(pa_stream *s, const char *const keys[], pa_stream_success_cb_t cb, void *userdata);
/** For record streams connected to a monitor source: monitor only a
- * very specific sink input of the sink. Thus function needs to be
+ * very specific sink input of the sink. This function needs to be
* called before pa_stream_connect_record() is called. \since
* 0.9.11 */
int pa_stream_set_monitor_stream(pa_stream *s, uint32_t sink_input_idx);
commit 525311abfbf8bc86874f81df37eadc7fff0940a2
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 19:50:37 2011 +0100
mainloop: Fix typos and rewording of thread-mainloop.h doxygen documentation
diff --git a/src/pulse/thread-mainloop.h b/src/pulse/thread-mainloop.h
index f911228..ff166f8 100644
--- a/src/pulse/thread-mainloop.h
+++ b/src/pulse/thread-mainloop.h
@@ -155,7 +155,7 @@ PA_C_DECL_BEGIN
* deal with that.
*
* The functions will not dead lock because the wait function will release
- * the lock before waiting and then regrab it once it has been signaled.
+ * the lock before waiting and then regrab it once it has been signalled.
* For those of you familiar with threads, the behaviour is that of a
* condition variable.
*
@@ -207,10 +207,10 @@ PA_C_DECL_BEGIN
* copy the contents of success, but for larger data structures this can be
* wasteful.
*
- * The difference here compared to the basic callback is the 1 sent to
- * pa_threaded_mainloop_signal() and the call to
+ * The difference here compared to the basic callback is the value 1 passed
+ * to pa_threaded_mainloop_signal() and the call to
* pa_threaded_mainloop_accept(). What will happen is that
- * pa_threaded_mainloop_signal() will signal the main function and then stop.
+ * pa_threaded_mainloop_signal() will signal the main function and then wait.
* The main function is then free to use the data in the callback until
* pa_threaded_mainloop_accept() is called, which will allow the callback
* to continue.
@@ -223,10 +223,10 @@ PA_C_DECL_BEGIN
* \subsection async_subsec Asynchronous callbacks
*
* PulseAudio also has callbacks that are completely asynchronous, meaning
- * that they can be called at any time. The threading main loop API provides
+ * that they can be called at any time. The threaded main loop API provides
* the locking mechanism to handle concurrent accesses, but nothing else.
* Applications will have to handle communication from the callback to the
- * main program through some own system.
+ * main program through its own mechanisms.
*
* The callbacks that are completely asynchronous are:
*
@@ -277,13 +277,13 @@ void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m);
/** Wait for an event to be signalled by the event loop thread. You
* can use this to pass data from the event loop thread to the main
- * thread in synchronized fashion. This function may not be called
+ * thread in a synchronized fashion. This function may not be called
* inside the event loop thread. Prior to this call the event loop
* object needs to be locked using pa_threaded_mainloop_lock(). While
- * waiting the lock will be released, immediately before returning it
+ * waiting the lock will be released. Immediately before returning it
* will be acquired again. This function may spuriously wake up even
- * without _signal() being called. You need to make sure to handle
- * that! */
+ * without pa_threaded_mainloop_signal() being called. You need to
+ * make sure to handle that! */
void pa_threaded_mainloop_wait(pa_threaded_mainloop *m);
/** Signal all threads waiting for a signalling event in
@@ -299,15 +299,16 @@ void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_accept);
* wait_for_accept value. */
void pa_threaded_mainloop_accept(pa_threaded_mainloop *m);
-/** Return the return value as specified with the main loop's quit() routine. */
+/** Return the return value as specified with the main loop's
+ * pa_mainloop_quit() routine. */
int pa_threaded_mainloop_get_retval(pa_threaded_mainloop *m);
-/** Return the abstract main loop abstraction layer vtable for this
- main loop. No need to free the API as it is owned by the loop
- and is destroyed when the loop is freed. */
+/** Return the main loop abstraction layer vtable for this main loop.
+ * There is no need to free this object as it is owned by the loop
+ * and is destroyed when the loop is freed. */
pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m);
-/** Returns non-zero when called from withing the event loop thread. \since 0.9.7 */
+/** Returns non-zero when called from within the event loop thread. \since 0.9.7 */
int pa_threaded_mainloop_in_thread(pa_threaded_mainloop *m);
PA_C_DECL_END
commit 57a50cdaec38ebd2b745ce1529e0b6a36bc9f0b2
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 19:50:36 2011 +0100
simple: Fix typos in simple.h doxygen documentation
diff --git a/src/pulse/simple.h b/src/pulse/simple.h
index eebed5d..0fab8ee 100644
--- a/src/pulse/simple.h
+++ b/src/pulse/simple.h
@@ -37,9 +37,9 @@
*
* The simple API is designed for applications with very basic sound
* playback or capture needs. It can only support a single stream per
- * connection and has no handling of complex features like events, channel
- * mappings and volume control. It is, however, very simple to use and
- * quite sufficient for many programs.
+ * connection and has no support for handling of complex features like
+ * events, channel mappings and volume control. It is, however, very simple
+ * to use and quite sufficient for many programs.
*
* \section conn_sec Connecting
*
@@ -73,7 +73,7 @@
*
* Once the connection is established to the server, data can start flowing.
* Using the connection is very similar to the normal read() and write()
- * system calls. The main difference is that they're call pa_simple_read()
+ * system calls. The main difference is that they're called pa_simple_read()
* and pa_simple_write(). Note that these operations always block.
*
* \section ctrl_sec Buffer control
@@ -115,35 +115,35 @@ PA_C_DECL_BEGIN
* An opaque simple connection object */
typedef struct pa_simple pa_simple;
-/** Create a new connection to the server */
+/** Create a new connection to the server. */
pa_simple* pa_simple_new(
const char *server, /**< Server name, or NULL for default */
const char *name, /**< A descriptive name for this client (application name, ...) */
pa_stream_direction_t dir, /**< Open this stream for recording or playback? */
const char *dev, /**< Sink (resp. source) name, or NULL for default */
- const char *stream_name, /**< A descriptive name for this client (application name, song title, ...) */
+ const char *stream_name, /**< A descriptive name for this stream (application name, song title, ...) */
const pa_sample_spec *ss, /**< The sample type to use */
const pa_channel_map *map, /**< The channel map to use, or NULL for default */
const pa_buffer_attr *attr, /**< Buffering attributes, or NULL for default */
int *error /**< A pointer where the error code is stored when the routine returns NULL. It is OK to pass NULL here. */
);
-/** Close and free the connection to the server. The connection objects becomes invalid when this is called. */
+/** Close and free the connection to the server. The connection object becomes invalid when this is called. */
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 bytes, int *error);
+/** Write some data to the server. */
+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 */
+/** 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 bytes, int *error);
+/** Read some data from the server. */
+int pa_simple_read(pa_simple *s, void *data, size_t bytes, int *error);
/** Return the playback 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 buffer. This discards any audio in the buffer. */
int pa_simple_flush(pa_simple *s, int *error);
PA_C_DECL_END
commit 107ee0b69a4d589493787fdb10e55dfd1f99c4ef
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 19:50:35 2011 +0100
stream: Fix 'e g' as 'e.g.\ '
diff --git a/src/pulse/stream.h b/src/pulse/stream.h
index 44a1d48..622b4d6 100644
--- a/src/pulse/stream.h
+++ b/src/pulse/stream.h
@@ -571,7 +571,7 @@ void pa_stream_set_read_callback(pa_stream *p, pa_stream_request_cb_t cb, void *
void pa_stream_set_overflow_callback(pa_stream *p, pa_stream_notify_cb_t cb, void *userdata);
/** Return at what position the latest underflow occurred, or -1 if this information is not
- * known (e g if no underflow has occurred, or server is older than 1.0).
+ * known (e.g.\ if no underflow has occurred, or server is older than 1.0).
* Can be used inside the underflow callback to get information about the current underflow.
* (Only for playback streams) \since 1.0 */
int64_t pa_stream_get_underflow_index(pa_stream *p);
commit 398e35088599f540cedac0f2fdda43dce3f28856
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 10:59:45 2011 +0100
error: Fix spelling of 'initialization' in errortab for PA_ERR_MODINITFAILED
Also update the related translations.
diff --git a/po/as.po b/po/as.po
index 0c20a63..29c5c9e 100644
--- a/po/as.po
+++ b/po/as.po
@@ -1068,7 +1068,7 @@ msgid "Invalid server"
msgstr "সেৱক বৈধ নহয়"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "মডিউল আৰমà§à¦ কৰিবলৈ বà§à¦¯à§°à§à¦¥"
#: ../src/pulse/error.c:58
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 1e11457..942a775 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -1080,7 +1080,7 @@ msgid "Invalid server"
msgstr "সারà§à¦à¦¾à¦° বৈধ নয়"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "মডিউল আরমà§à¦ করতে বà§à¦¯à¦°à§à¦¥"
#: ../src/pulse/error.c:58
diff --git a/po/ca.po b/po/ca.po
index 95d9377..528ca61 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -1108,7 +1108,7 @@ msgid "Invalid server"
msgstr "Servidor incorrecte"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Ha fallat la inicialització del mòdul"
#: ../src/pulse/error.c:58
diff --git a/po/cs.po b/po/cs.po
index b9a713c..36c674a 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -1076,7 +1076,7 @@ msgid "Invalid server"
msgstr "Neplatný server"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Spuštěnà modulu selhalo"
#: ../src/pulse/error.c:58
diff --git a/po/de.po b/po/de.po
index d08a3fa..6970a89 100644
--- a/po/de.po
+++ b/po/de.po
@@ -1078,7 +1078,7 @@ msgid "Invalid server"
msgstr "Ungültiger Server"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Modulinitialisierung fehlgeschlagen"
#: ../src/pulse/error.c:58
diff --git a/po/de_CH.po b/po/de_CH.po
index e31419f..64cb064 100644
--- a/po/de_CH.po
+++ b/po/de_CH.po
@@ -1060,7 +1060,7 @@ msgid "Invalid server"
msgstr "Ungültiger Server"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Modulinitialisierung fehlgeschlagen"
#: ../src/pulse/error.c:58
diff --git a/po/el.po b/po/el.po
index de92385..579df57 100644
--- a/po/el.po
+++ b/po/el.po
@@ -974,7 +974,7 @@ msgid "Invalid server"
msgstr ""
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr ""
#: ../src/pulse/error.c:58
diff --git a/po/es.po b/po/es.po
index 84c67f0..892df62 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1095,7 +1095,7 @@ msgid "Invalid server"
msgstr "Servidor inválido"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Falló la inicialización del módulo"
#: ../src/pulse/error.c:58
diff --git a/po/fi.po b/po/fi.po
index fcdfa2a..de3815b 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -1091,7 +1091,7 @@ msgid "Invalid server"
msgstr "Virheellinen palvelin"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Moduulin alustus epäonnistui"
#: ../src/pulse/error.c:58
diff --git a/po/fr.po b/po/fr.po
index 355ec23..eb15bf1 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -1105,7 +1105,7 @@ msgid "Invalid server"
msgstr "Serveur invalide"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Échec lors de l'initialisation du module"
#: ../src/pulse/error.c:58
diff --git a/po/gu.po b/po/gu.po
index 1d0f38d..3e040a2 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -1069,7 +1069,7 @@ msgid "Invalid server"
msgstr "અયોગà«àª¯ સરà«àªµàª°"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "મોડà«àª¯à«àª² શરૂઆત કરવાનà«àª‚ નિષà«àª«àª³"
#: ../src/pulse/error.c:58
diff --git a/po/he.po b/po/he.po
index 6231bd6..9a56162 100644
--- a/po/he.po
+++ b/po/he.po
@@ -968,7 +968,7 @@ msgid "Invalid server"
msgstr ""
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr ""
#: ../src/pulse/error.c:58
diff --git a/po/hi.po b/po/hi.po
index cb2b048..31e100d 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -1073,7 +1073,7 @@ msgid "Invalid server"
msgstr "अवैध सरà¥à¤µà¤°"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "मॉडयूल आरंà¤à¥€à¤•à¤°à¤£ असफल"
#: ../src/pulse/error.c:58
diff --git a/po/hu.po b/po/hu.po
index 6dae81e..bb9d494 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -1012,7 +1012,7 @@ msgid "Invalid server"
msgstr "Érvénytelen kiszolgáló"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "A modul elÅ‘készÃtése meghiúsult."
#: ../src/pulse/error.c:58
diff --git a/po/it.po b/po/it.po
index 1e8c4b6..b9aeace 100644
--- a/po/it.po
+++ b/po/it.po
@@ -1119,7 +1119,7 @@ msgid "Invalid server"
msgstr "Server non valido"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Inizializzazione del modulo non riuscita"
#: ../src/pulse/error.c:58
diff --git a/po/ja.po b/po/ja.po
index b23297b..df6fbb5 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -1081,7 +1081,7 @@ msgid "Invalid server"
msgstr "無効ãªã‚µãƒ¼ãƒãƒ¼"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "モジュールåˆæœŸåŒ–失敗"
#: ../src/pulse/error.c:58
diff --git a/po/kn.po b/po/kn.po
index 96afa31..a25392a 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -1082,7 +1082,7 @@ msgid "Invalid server"
msgstr "ಅಮಾನà³à²¯à²µà²¾à²¦ ಪರಿಚಾರಕ"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "ಘಟಕವನà³à²¨à³ ಆರಂà²à²¿à²¸à³à²µà²²à³à²²à²¿ ವಿಫಲಗೊಂಡಿದೆ"
#: ../src/pulse/error.c:58
diff --git a/po/ml.po b/po/ml.po
index 492070f..434ad7c 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -1066,7 +1066,7 @@ msgid "Invalid server"
msgstr "തെറàµà´±à´¾à´¯ സരàµâ€à´µà´°àµâ€"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "ഘടകം ആരംà´à´¿à´•àµà´•àµà´¨àµà´¨à´¤à´¿à´²àµâ€ പരാജയപàµà´ªàµ†à´Ÿàµà´Ÿàµ"
#: ../src/pulse/error.c:58
diff --git a/po/mr.po b/po/mr.po
index 329b271..6b9279a 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -1069,7 +1069,7 @@ msgid "Invalid server"
msgstr "अवैध सरà¥à¤µà¤°"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "घटक पà¥à¤°à¤¾à¤°à¤‚ठअपयशी"
#: ../src/pulse/error.c:58
diff --git a/po/nl.po b/po/nl.po
index bb44e54..386d89a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -1084,7 +1084,7 @@ msgid "Invalid server"
msgstr "Ongeldige server"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Module-initialisatie mislukt"
#: ../src/pulse/error.c:58
diff --git a/po/or.po b/po/or.po
index 47337a0..1559b6c 100644
--- a/po/or.po
+++ b/po/or.po
@@ -1085,7 +1085,7 @@ msgid "Invalid server"
msgstr "ଅବàˆà¬§ ସରàà¬à¬°"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "à¬à¬•à¬•à¬¾à¬‚ଶ ପàରାରମàà¬à¬¿à¬•à¬°à¬£ ବିଫଳ ହà‹à¬‡à¬›à¬¿"
#: ../src/pulse/error.c:58
diff --git a/po/pa.po b/po/pa.po
index 1cc19e7..43c3ff3 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -1062,7 +1062,7 @@ msgid "Invalid server"
msgstr "ਅਢà©à©±à¨•à¨µà¨¾à¨‚ ਸਰਵਰ"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "ਮੋਡੀਊਲ ਸ਼à©à¨°à©‚ ਕਰਨਾ ਫੇਲà©à¨¹"
#: ../src/pulse/error.c:58
diff --git a/po/pl.po b/po/pl.po
index b241a1c..584b73e 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -1082,7 +1082,7 @@ msgid "Invalid server"
msgstr "Nieprawidłowy serwer"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Zainicjowanie modułu nie powiodło się"
#: ../src/pulse/error.c:58
diff --git a/po/pt.po b/po/pt.po
index b24abfa..26a65f4 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -1085,7 +1085,7 @@ msgid "Invalid server"
msgstr "Servidor Inválido"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Inicialização do módulo falhou"
#: ../src/pulse/error.c:58
diff --git a/po/pt_BR.po b/po/pt_BR.po
index d91484d..bf5240c 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -1089,7 +1089,7 @@ msgid "Invalid server"
msgstr "Servidor inválido"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "A inicialização do módulo falhou"
#: ../src/pulse/error.c:58
diff --git a/po/ru.po b/po/ru.po
index 810c26e..c5fe169 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -1075,7 +1075,7 @@ msgid "Invalid server"
msgstr "Ðеверный Ñервер"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Ð˜Ð½Ð¸Ñ†Ð¸Ð°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ñ Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð½Ðµ удалаÑÑŒ"
#: ../src/pulse/error.c:58
diff --git a/po/sr.po b/po/sr.po
index ed1b2b1..4ddec1b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -1085,7 +1085,7 @@ msgid "Invalid server"
msgstr "Сервер неиÑправан"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Иницијализација модула није уÑпела"
#: ../src/pulse/error.c:58
diff --git a/po/sr at latin.po b/po/sr at latin.po
index c42db98..bb22ce8 100644
--- a/po/sr at latin.po
+++ b/po/sr at latin.po
@@ -1086,7 +1086,7 @@ msgid "Invalid server"
msgstr "Server neispravan"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Inicijalizacija modula nije uspela"
#: ../src/pulse/error.c:58
diff --git a/po/sv.po b/po/sv.po
index eee7585..adbc87f 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -980,7 +980,7 @@ msgid "Invalid server"
msgstr "Ogiltig server"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr ""
#: ../src/pulse/error.c:58
diff --git a/po/ta.po b/po/ta.po
index 1fe6bc3..cdc9970 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -1093,7 +1093,7 @@ msgid "Invalid server"
msgstr "தவறான பà¯à®°à®µà®²à®©à¯"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "தொகà¯à®¤à®¿à®¯à¯ˆ தà¯à®µà®•à¯à®• à®®à¯à®Ÿà®¿à®¯à®µà®¿à®²à¯à®²à¯ˆ"
#: ../src/pulse/error.c:58
diff --git a/po/te.po b/po/te.po
index a861dda..5f46bdf 100644
--- a/po/te.po
+++ b/po/te.po
@@ -1069,7 +1069,7 @@ msgid "Invalid server"
msgstr "చెలà±à°²à°¨à°¿ సేవిక"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "మాడà±à°¯à±‚లౠసిదà±à°¦à±€à°•à°°à°£ విఫలమైంది"
#: ../src/pulse/error.c:58
diff --git a/po/uk.po b/po/uk.po
index 528a6e5..0b04725 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -1103,7 +1103,7 @@ msgid "Invalid server"
msgstr "Ðекоректний Ñервер"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "Спроба ініціалізації Ð¼Ð¾Ð´ÑƒÐ»Ñ Ð·Ð°Ð²ÐµÑ€ÑˆÐ¸Ð»Ð°ÑÑ Ð½ÐµÐ²Ð´Ð°Ð»Ð¾"
#: ../src/pulse/error.c:58
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 337f2b5..d9933c8 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -1045,7 +1045,7 @@ msgid "Invalid server"
msgstr "æ— æ•ˆæœåŠ¡å™¨"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "模å—åˆå§‹åŒ–失败"
#: ../src/pulse/error.c:58
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 50b049b..1780156 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -972,7 +972,7 @@ msgid "Invalid server"
msgstr "無效的伺æœå™¨"
#: ../src/pulse/error.c:57
-msgid "Module initalization failed"
+msgid "Module initialization failed"
msgstr "模組åˆå§‹åŒ–失敗"
#: ../src/pulse/error.c:58
diff --git a/src/pulse/error.c b/src/pulse/error.c
index eb5082a..751d42a 100644
--- a/src/pulse/error.c
+++ b/src/pulse/error.c
@@ -51,7 +51,7 @@ const char*pa_strerror(int error) {
[PA_ERR_CONNECTIONTERMINATED] = N_("Connection terminated"),
[PA_ERR_KILLED] = N_("Entity killed"),
[PA_ERR_INVALIDSERVER] = N_("Invalid server"),
- [PA_ERR_MODINITFAILED] = N_("Module initalization failed"),
+ [PA_ERR_MODINITFAILED] = N_("Module initialization failed"),
[PA_ERR_BADSTATE] = N_("Bad state"),
[PA_ERR_NODATA] = N_("No data"),
[PA_ERR_VERSION] = N_("Incompatible protocol version"),
commit d6512750fd296e81444c7f5c922a5db5a8ff1df8
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:50 2011 +0100
proplist: Consistently use parameter name p for a pa_proplist* in prototype
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index 099599f..97694df 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -391,13 +391,13 @@ void pa_proplist_clear(pa_proplist *p);
/** Allocate a new property list and copy over every single entry from
* the specific list. \since 0.9.11 */
-pa_proplist* pa_proplist_copy(pa_proplist *t);
+pa_proplist* pa_proplist_copy(pa_proplist *p);
/** Return the number of entries in the property list. \since 0.9.15 */
-unsigned pa_proplist_size(pa_proplist *t);
+unsigned pa_proplist_size(pa_proplist *p);
/** Returns 0 when the proplist is empty, positive otherwise \since 0.9.15 */
-int pa_proplist_isempty(pa_proplist *t);
+int pa_proplist_isempty(pa_proplist *p);
/** Return non-zero when a and b have the same keys and values.
* \since 0.9.16 */
commit 9e22ff0f033233a76562fd93294027c8c859236f
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:49 2011 +0100
utf8: Fix doxygen file description for utf8.h
diff --git a/src/pulse/utf8.h b/src/pulse/utf8.h
index b9f7495..2b5bd28 100644
--- a/src/pulse/utf8.h
+++ b/src/pulse/utf8.h
@@ -28,7 +28,7 @@
#include <pulse/version.h>
/** \file
- * UTF8 Validation functions
+ * UTF-8 validation functions
*/
PA_C_DECL_BEGIN
commit 8049bd0b193ac8563751d2f9e234d4685d3cebab
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:48 2011 +0100
proplist: Fix typos in doxygen documentation
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index 151bf8f..099599f 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -322,7 +322,7 @@ int pa_proplist_get(pa_proplist *p, const char *key, const void **data, size_t *
typedef enum pa_update_mode {
PA_UPDATE_SET
/**< Replace the entire property list with the new one. Don't keep
- * any of the old data around */,
+ * any of the old data around. */,
PA_UPDATE_MERGE
/**< Merge new property list into the existing one, not replacing
@@ -350,9 +350,9 @@ void pa_proplist_update(pa_proplist *p, pa_update_mode_t mode, pa_proplist *othe
int pa_proplist_unset(pa_proplist *p, const char *key);
/** Similar to pa_proplist_unset() but takes an array of keys to
- * remove. The array should be terminated by a NULL pointer. Return -1
+ * remove. The array should be terminated by a NULL pointer. Returns -1
* on failure, otherwise the number of entries actually removed (which
- * might even be 0, if there where no matching entries to
+ * might even be 0, if there were no matching entries to
* remove). \since 0.9.11 */
int pa_proplist_unset_many(pa_proplist *p, const char * const keys[]);
@@ -361,8 +361,8 @@ int pa_proplist_unset_many(pa_proplist *p, const char * const keys[]);
* to this variable should then be passed to pa_proplist_iterate()
* which should be called in a loop until it returns NULL which
* signifies EOL. The property list should not be modified during
- * iteration through the list -- except for deleting the current
- * looked at entry. On each invocation this function will return the
+ * iteration through the list -- with the exception of deleting the
+ * current entry. On each invocation this function will return the
* key string for the next entry. The keys in the property list do not
* have any particular order. \since 0.9.11 */
const char *pa_proplist_iterate(pa_proplist *p, void **state);
@@ -393,7 +393,7 @@ void pa_proplist_clear(pa_proplist *p);
* the specific list. \since 0.9.11 */
pa_proplist* pa_proplist_copy(pa_proplist *t);
-/** Return the number of entries on the property list. \since 0.9.15 */
+/** Return the number of entries in the property list. \since 0.9.15 */
unsigned pa_proplist_size(pa_proplist *t);
/** Returns 0 when the proplist is empty, positive otherwise \since 0.9.15 */
commit 8eb0516058949fe34cd467867a5d2b6a2d31332c
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:47 2011 +0100
proplist: Add doxygen file description for proplist.h
diff --git a/src/pulse/proplist.h b/src/pulse/proplist.h
index bc143bc..151bf8f 100644
--- a/src/pulse/proplist.h
+++ b/src/pulse/proplist.h
@@ -28,6 +28,9 @@
#include <pulse/gccmacro.h>
#include <pulse/version.h>
+/** \file
+ * Property list constants and functions */
+
PA_C_DECL_BEGIN
/** For streams: localized media name, formatted as UTF-8. e.g. "Guns'N'Roses: Civil War".*/
commit 4e429a51a3f38aba05bdc06de1e70a77a741233b
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:46 2011 +0100
introspect: Fix unresolved doxygen link pa_port_available_t
diff --git a/src/pulse/introspect.h b/src/pulse/introspect.h
index afa4e8e..b1fd6d4 100644
--- a/src/pulse/introspect.h
+++ b/src/pulse/introspect.h
@@ -202,7 +202,7 @@ typedef struct pa_sink_port_info {
const char *name; /**< Name of this port */
const char *description; /**< Description of this port */
uint32_t priority; /**< The higher this value is the more useful this port is as a default */
- int available; /**< A \link pa_port_available_t, indicating availability status of this port. \since 2.0 */
+ int available; /**< A flags (see #pa_port_available),indicating availability status of this port. \since 2.0 */
} pa_sink_port_info;
/** Stores information about sinks. Please note that this structure
@@ -282,7 +282,7 @@ typedef struct pa_source_port_info {
const char *name; /**< Name of this port */
const char *description; /**< Description of this port */
uint32_t priority; /**< The higher this value is the more useful this port is as a default */
- int available; /**< A \link pa_port_available_t, indicating availability status of this port. \since 2.0 */
+ int available; /**< A flags (see #pa_port_available) indicating availability status of this port. \since 2.0 */
} pa_source_port_info;
/** Stores information about sources. Please note that this structure
commit ddd7a91f5d178c7f2972891ef95b565e24d2b210
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:45 2011 +0100
format: Add description for format.h
diff --git a/src/pulse/format.h b/src/pulse/format.h
index 4f7db65..8b0d847 100644
--- a/src/pulse/format.h
+++ b/src/pulse/format.h
@@ -30,6 +30,9 @@
#include <pulse/sample.h>
#include <pulse/channelmap.h>
+/** \file
+ * Utility functions for handling a stream or sink format */
+
PA_C_DECL_BEGIN
/** Represents the type of encoding used in a stream or accepted by a sink. \since 1.0 */
commit 6e7e5d6fa0cfeba62dff6f3340db659d10ede98e
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:44 2011 +0100
format: Add periods to fix brief documentation for pa_format_info_is_pcm()
diff --git a/src/pulse/format.h b/src/pulse/format.h
index fead1d8..4f7db65 100644
--- a/src/pulse/format.h
+++ b/src/pulse/format.h
@@ -77,7 +77,7 @@ typedef struct pa_format_info {
/** Allocates a new \a pa_format_info structure. Clients must initialise at least the encoding field themselves. */
pa_format_info* pa_format_info_new(void);
-/** Returns a new \a pa_format_info struct and representing the same format as \a src */
+/** Returns a new \a pa_format_info struct and representing the same format as \a src. */
pa_format_info* pa_format_info_copy(const pa_format_info *src);
/** Frees a \a pa_format_info structure */
@@ -86,7 +86,7 @@ void pa_format_info_free(pa_format_info *f);
/** Returns non-zero when the format info structure is valid */
int pa_format_info_valid(const pa_format_info *f);
-/** Returns non-zero when the format info structure represents a PCM (i.e. uncompressed data) format */
+/** Returns non-zero when the format info structure represents a PCM (i.e.\ uncompressed data) format. */
int pa_format_info_is_pcm(const pa_format_info *f);
/** Returns non-zero if the format represented by \a first is a subset of
commit 66b2755361160282bff31754c1a30c7a52974c7e
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 13:19:43 2011 +0100
format: Fix unknown doxygen command \second
diff --git a/src/pulse/format.h b/src/pulse/format.h
index 67996c5..fead1d8 100644
--- a/src/pulse/format.h
+++ b/src/pulse/format.h
@@ -89,8 +89,8 @@ int pa_format_info_valid(const pa_format_info *f);
/** Returns non-zero when the format info structure represents a PCM (i.e. uncompressed data) format */
int pa_format_info_is_pcm(const pa_format_info *f);
-/** Returns non-zero if the format represented \a first is a subset of
- * the format represented by \second. This means that \a second must
+/** Returns non-zero if the format represented by \a first is a subset of
+ * the format represented by \a second. This means that \a second must
* have all the fields that \a first does, but the reverse need not
* be true. This is typically expected to be used to check if a
* stream's format is compatible with a given sink. In such a case,
commit 564997e4874a659bbd52a069d94fe981075dd1b7
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Sun Dec 11 16:07:39 2011 +0100
def: Document that pa_buffer_attr.maxlength is in bytes.
Fixes https://bugs.freedesktop.org/show_bug.cgi?id=42919
diff --git a/src/pulse/def.h b/src/pulse/def.h
index ca74dfc..98d3651 100644
--- a/src/pulse/def.h
+++ b/src/pulse/def.h
@@ -339,7 +339,7 @@ typedef enum pa_stream_flags {
/** Playback and record buffer metrics */
typedef struct pa_buffer_attr {
uint32_t maxlength;
- /**< Maximum length of the buffer. Setting this to (uint32_t) -1
+ /**< Maximum length of the buffer in bytes. Setting this to (uint32_t) -1
* will initialize this to the maximum value supported by server,
* which is recommended. */
commit d7358579426f1e613812cb193d684cb0f4856ddf
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Sun Dec 11 16:07:38 2011 +0100
stream: Fix comments
diff --git a/src/pulse/stream.c b/src/pulse/stream.c
index 5433abf..0a96ced 100644
--- a/src/pulse/stream.c
+++ b/src/pulse/stream.c
@@ -143,7 +143,7 @@ static pa_stream *pa_stream_new_with_proplist_internal(
s->requested_bytes = 0;
memset(&s->buffer_attr, 0, sizeof(s->buffer_attr));
- /* We initialize der target length here, so that if the user
+ /* We initialize the target length here, so that if the user
* passes no explicit buffering metrics the default is similar to
* what older PA versions provided. */
@@ -245,7 +245,7 @@ static void stream_unlink(pa_stream *s) {
/* Detach from context */
- /* Unref all operation object that point to us */
+ /* Unref all operation objects that point to us */
for (o = s->context->operations; o; o = n) {
n = o->next;
@@ -472,7 +472,7 @@ static void check_smoother_status(pa_stream *s, pa_bool_t aposteriori, pa_bool_t
* indications when audio really starts/stops playing, if
* we don't have any timing info yet -- instead of trying
* to be smart and guessing the server time. Otherwise the
- * unknown transport delay add too much noise to our time
+ * unknown transport delay adds too much noise to our time
* calculations. */
return;
commit c6b95d52355a5a2731fcb3018b37902a16f4d359
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date: Mon Dec 12 22:36:39 2011 +0000
pstream: Fix spelling of 'receive'.
These functions are not exported in the map file and thus do
not form part of the API and can be corrected without any problem.
diff --git a/src/modules/module-tunnel.c b/src/modules/module-tunnel.c
index 61ec35d..a667e21 100644
--- a/src/modules/module-tunnel.c
+++ b/src/modules/module-tunnel.c
@@ -1826,9 +1826,9 @@ static void on_connection(pa_socket_client *sc, pa_iochannel *io, void *userdata
u->pdispatch = pa_pdispatch_new(u->core->mainloop, TRUE, command_table, PA_COMMAND_MAX);
pa_pstream_set_die_callback(u->pstream, pstream_die_callback, u);
- pa_pstream_set_recieve_packet_callback(u->pstream, pstream_packet_callback, u);
+ pa_pstream_set_receive_packet_callback(u->pstream, pstream_packet_callback, u);
#ifndef TUNNEL_SINK
- pa_pstream_set_recieve_memblock_callback(u->pstream, pstream_memblock_callback, u);
+ pa_pstream_set_receive_memblock_callback(u->pstream, pstream_memblock_callback, u);
#endif
t = pa_tagstruct_new(NULL, 0);
diff --git a/src/pulse/context.c b/src/pulse/context.c
index af144aa..e03d88c 100644
--- a/src/pulse/context.c
+++ b/src/pulse/context.c
@@ -518,8 +518,8 @@ static void setup_context(pa_context *c, pa_iochannel *io) {
c->pstream = pa_pstream_new(c->mainloop, io, c->mempool);
pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
- pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
- pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
+ pa_pstream_set_receive_packet_callback(c->pstream, pstream_packet_callback, c);
+ pa_pstream_set_receive_memblock_callback(c->pstream, pstream_memblock_callback, c);
pa_assert(!c->pdispatch);
c->pdispatch = pa_pdispatch_new(c->mainloop, c->use_rtclock, command_table, PA_COMMAND_MAX);
diff --git a/src/pulsecore/protocol-native.c b/src/pulsecore/protocol-native.c
index 5d1d485..841734f 100644
--- a/src/pulsecore/protocol-native.c
+++ b/src/pulsecore/protocol-native.c
@@ -4937,8 +4937,8 @@ void pa_native_protocol_connect(pa_native_protocol *p, pa_iochannel *io, pa_nati
c->client->userdata = c;
c->pstream = pa_pstream_new(p->core->mainloop, io, p->core->mempool);
- pa_pstream_set_recieve_packet_callback(c->pstream, pstream_packet_callback, c);
- pa_pstream_set_recieve_memblock_callback(c->pstream, pstream_memblock_callback, c);
+ pa_pstream_set_receive_packet_callback(c->pstream, pstream_packet_callback, c);
+ pa_pstream_set_receive_memblock_callback(c->pstream, pstream_memblock_callback, c);
pa_pstream_set_die_callback(c->pstream, pstream_die_callback, c);
pa_pstream_set_drain_callback(c->pstream, pstream_drain_callback, c);
pa_pstream_set_revoke_callback(c->pstream, pstream_revoke_callback, c);
diff --git a/src/pulsecore/pstream.c b/src/pulsecore/pstream.c
index 99eb02e..9945797 100644
--- a/src/pulsecore/pstream.c
+++ b/src/pulsecore/pstream.c
@@ -139,11 +139,11 @@ struct pa_pstream {
pa_memimport *import;
pa_memexport *export;
- pa_pstream_packet_cb_t recieve_packet_callback;
- void *recieve_packet_callback_userdata;
+ pa_pstream_packet_cb_t receive_packet_callback;
+ void *receive_packet_callback_userdata;
- pa_pstream_memblock_cb_t recieve_memblock_callback;
- void *recieve_memblock_callback_userdata;
+ pa_pstream_memblock_cb_t receive_memblock_callback;
+ void *receive_memblock_callback_userdata;
pa_pstream_notify_cb_t drain_callback;
void *drain_callback_userdata;
@@ -248,10 +248,10 @@ pa_pstream *pa_pstream_new(pa_mainloop_api *m, pa_iochannel *io, pa_mempool *poo
p->read.packet = NULL;
p->read.index = 0;
- p->recieve_packet_callback = NULL;
- p->recieve_packet_callback_userdata = NULL;
- p->recieve_memblock_callback = NULL;
- p->recieve_memblock_callback_userdata = NULL;
+ p->receive_packet_callback = NULL;
+ p->receive_packet_callback_userdata = NULL;
+ p->receive_memblock_callback = NULL;
+ p->receive_memblock_callback_userdata = NULL;
p->drain_callback = NULL;
p->drain_callback_userdata = NULL;
p->die_callback = NULL;
@@ -762,7 +762,7 @@ static int do_read(pa_pstream *p) {
} else if (p->read.index > PA_PSTREAM_DESCRIPTOR_SIZE) {
/* Frame payload available */
- if (p->read.memblock && p->recieve_memblock_callback) {
+ if (p->read.memblock && p->receive_memblock_callback) {
/* Is this memblock data? Than pass it to the user */
l = (p->read.index - (size_t) r) < PA_PSTREAM_DESCRIPTOR_SIZE ? (size_t) (p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE) : (size_t) r;
@@ -774,20 +774,20 @@ static int do_read(pa_pstream *p) {
chunk.index = p->read.index - PA_PSTREAM_DESCRIPTOR_SIZE - l;
chunk.length = l;
- if (p->recieve_memblock_callback) {
+ if (p->receive_memblock_callback) {
int64_t offset;
offset = (int64_t) (
(((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
(((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
- p->recieve_memblock_callback(
+ p->receive_memblock_callback(
p,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
offset,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
&chunk,
- p->recieve_memblock_callback_userdata);
+ p->receive_memblock_callback_userdata);
}
/* Drop seek info for following callbacks */
@@ -807,11 +807,11 @@ static int do_read(pa_pstream *p) {
} else if (p->read.packet) {
- if (p->recieve_packet_callback)
+ if (p->receive_packet_callback)
#ifdef HAVE_CREDS
- p->recieve_packet_callback(p, p->read.packet, p->read_creds_valid ? &p->read_creds : NULL, p->recieve_packet_callback_userdata);
+ p->receive_packet_callback(p, p->read.packet, p->read_creds_valid ? &p->read_creds : NULL, p->receive_packet_callback_userdata);
#else
- p->recieve_packet_callback(p, p->read.packet, NULL, p->recieve_packet_callback_userdata);
+ p->receive_packet_callback(p, p->read.packet, NULL, p->receive_packet_callback_userdata);
#endif
pa_packet_unref(p->read.packet);
@@ -832,7 +832,7 @@ static int do_read(pa_pstream *p) {
pa_log_debug("Failed to import memory block.");
}
- if (p->recieve_memblock_callback) {
+ if (p->receive_memblock_callback) {
int64_t offset;
pa_memchunk chunk;
@@ -844,13 +844,13 @@ static int do_read(pa_pstream *p) {
(((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_HI])) << 32) |
(((uint64_t) ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_OFFSET_LO]))));
- p->recieve_memblock_callback(
+ p->receive_memblock_callback(
p,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_CHANNEL]),
offset,
ntohl(p->read.descriptor[PA_PSTREAM_DESCRIPTOR_FLAGS]) & PA_FLAG_SEEKMASK,
&chunk,
- p->recieve_memblock_callback_userdata);
+ p->receive_memblock_callback_userdata);
}
if (b)
@@ -898,20 +898,20 @@ void pa_pstream_set_drain_callback(pa_pstream *p, pa_pstream_notify_cb_t cb, voi
p->drain_callback_userdata = userdata;
}
-void pa_pstream_set_recieve_packet_callback(pa_pstream *p, pa_pstream_packet_cb_t cb, void *userdata) {
+void pa_pstream_set_receive_packet_callback(pa_pstream *p, pa_pstream_packet_cb_t cb, void *userdata) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
- p->recieve_packet_callback = cb;
- p->recieve_packet_callback_userdata = userdata;
+ p->receive_packet_callback = cb;
+ p->receive_packet_callback_userdata = userdata;
}
-void pa_pstream_set_recieve_memblock_callback(pa_pstream *p, pa_pstream_memblock_cb_t cb, void *userdata) {
+void pa_pstream_set_receive_memblock_callback(pa_pstream *p, pa_pstream_memblock_cb_t cb, void *userdata) {
pa_assert(p);
pa_assert(PA_REFCNT_VALUE(p) > 0);
- p->recieve_memblock_callback = cb;
- p->recieve_memblock_callback_userdata = userdata;
+ p->receive_memblock_callback = cb;
+ p->receive_memblock_callback_userdata = userdata;
}
void pa_pstream_set_release_callback(pa_pstream *p, pa_pstream_block_id_cb_t cb, void *userdata) {
@@ -990,8 +990,8 @@ void pa_pstream_unlink(pa_pstream *p) {
p->die_callback = NULL;
p->drain_callback = NULL;
- p->recieve_packet_callback = NULL;
- p->recieve_memblock_callback = NULL;
+ p->receive_packet_callback = NULL;
+ p->receive_memblock_callback = NULL;
}
void pa_pstream_enable_shm(pa_pstream *p, pa_bool_t enable) {
diff --git a/src/pulsecore/pstream.h b/src/pulsecore/pstream.h
index a528b25..6bb47fb 100644
--- a/src/pulsecore/pstream.h
+++ b/src/pulsecore/pstream.h
@@ -54,8 +54,8 @@ void pa_pstream_send_memblock(pa_pstream*p, uint32_t channel, int64_t offset, pa
void pa_pstream_send_release(pa_pstream *p, uint32_t block_id);
void pa_pstream_send_revoke(pa_pstream *p, uint32_t block_id);
-void pa_pstream_set_recieve_packet_callback(pa_pstream *p, pa_pstream_packet_cb_t cb, void *userdata);
-void pa_pstream_set_recieve_memblock_callback(pa_pstream *p, pa_pstream_memblock_cb_t cb, void *userdata);
+void pa_pstream_set_receive_packet_callback(pa_pstream *p, pa_pstream_packet_cb_t cb, void *userdata);
+void pa_pstream_set_receive_memblock_callback(pa_pstream *p, pa_pstream_memblock_cb_t cb, void *userdata);
void pa_pstream_set_drain_callback(pa_pstream *p, pa_pstream_notify_cb_t cb, void *userdata);
void pa_pstream_set_die_callback(pa_pstream *p, pa_pstream_notify_cb_t cb, void *userdata);
void pa_pstream_set_release_callback(pa_pstream *p, pa_pstream_block_id_cb_t cb, void *userdata);
More information about the pulseaudio-commits
mailing list