[pulseaudio-discuss] [PATCH] spelling, recieve
Peter Meerwald
pmeerw at pmeerw.net
Sun Dec 11 07:07:40 PST 2011
From: Peter Meerwald <p.meerwald at bct-electronic.com>
correct spelling of 'receive', resend of earlier patch
---
src/modules/module-tunnel.c | 4 +-
src/pulse/context.c | 4 +-
src/pulsecore/protocol-native.c | 4 +-
src/pulsecore/pstream.c | 52 +++++++++++++++++++-------------------
src/pulsecore/pstream.h | 4 +-
5 files changed, 34 insertions(+), 34 deletions(-)
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);
--
1.7.4.1
More information about the pulseaudio-discuss
mailing list