mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-12-21 08:56:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

tunnel-source-new: Fix shadow compiler warning

Browse source 
CC     modules/module_tunnel_sink_la-module-tunnel.lo
modules/module-tunnel-source-new.c: In function 'read_new_samples':
modules/module-tunnel-source-new.c:145:16: warning: declaration of 'read' shadows a global declaration [-Wshadow]

Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
This commit is contained in:
Peter Meerwald 2014-03-06 13:15:12 +01:00 • committed by Peter Meerwald
parent 73a6a169b2
commit 89749a5379
1 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/modules/module-tunnel-source-new.c
View file

@ -142,8 +142,8 @@ static void read_new_samples(struct userdata *u) {
readable = pa_stream_readable_size(u->stream); readable = pa_stream_readable_size(u->stream);
while (readable > 0) { while (readable > 0) {
size_t read = 0; size_t nbytes = 0;
if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &read) != 0)) { if (PA_UNLIKELY(pa_stream_peek(u->stream, &p, &nbytes) != 0)) {
pa_log("pa_stream_peek() failed: %s", pa_strerror(pa_context_errno(u->context))); pa_log("pa_stream_peek() failed: %s", pa_strerror(pa_context_errno(u->context)));
u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP); u->thread_mainloop_api->quit(u->thread_mainloop_api, TUNNEL_THREAD_FAILED_MAINLOOP);
return; return;
@ -151,14 +151,14 @@ static void read_new_samples(struct userdata *u) {
if (PA_LIKELY(p)) { if (PA_LIKELY(p)) {
/* we have valid data */ /* we have valid data */
memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, read, true); memchunk.memblock = pa_memblock_new_fixed(u->module->core->mempool, (void *) p, nbytes, true);
memchunk.length = read; memchunk.length = nbytes;
memchunk.index = 0; memchunk.index = 0;
pa_source_post(u->source, &memchunk); pa_source_post(u->source, &memchunk);
pa_memblock_unref_fixed(memchunk.memblock); pa_memblock_unref_fixed(memchunk.memblock);
} else { } else {
size_t bytes_to_generate = read; size_t bytes_to_generate = nbytes;
/* we have a hole. generate silence */ /* we have a hole. generate silence */
memchunk = u->source->silence; memchunk = u->source->silence;
@ -176,7 +176,7 @@ static void read_new_samples(struct userdata *u) {
} }
pa_stream_drop(u->stream); pa_stream_drop(u->stream);
readable -= read; readable -= nbytes;
} }
} }