diff options
Diffstat (limited to 'src/modules')
| -rw-r--r-- | src/modules/module-alsa-sink.c | 43 | ||||
| -rw-r--r-- | src/modules/module-alsa-source.c | 44 | ||||
| -rw-r--r-- | src/modules/module-null-sink.c | 18 | ||||
| -rw-r--r-- | src/modules/module-pipe-source.c | 5 | ||||
| -rw-r--r-- | src/modules/module-sine-source.c | 326 | ||||
| -rw-r--r-- | src/modules/module-sine.c | 58 |
6 files changed, 414 insertions, 80 deletions
diff --git a/src/modules/module-alsa-sink.c b/src/modules/module-alsa-sink.c index 95a8c972..f9fb9bd5 100644 --- a/src/modules/module-alsa-sink.c +++ b/src/modules/module-alsa-sink.c @@ -599,9 +599,9 @@ static int update_sw_params(struct userdata *u) { u->hwbuf_unused_frames = (snd_pcm_sframes_t) (PA_LIKELY(b < u->hwbuf_size) ? ((u->hwbuf_size - b) / u->frame_size) : 0); - - fix_tsched_watermark(u); } + + fix_tsched_watermark(u); } pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames); @@ -1506,28 +1506,35 @@ int pa__init(pa_module*m) { suitable = TRUE; } - if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) - pa_log_info("Mixer doesn't support dB information."); - else { + if (suitable) { + if (snd_mixer_selem_get_playback_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) + pa_log_info("Mixer doesn't support dB information."); + else { #ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); #endif - if (u->hw_dB_min >= u->hw_dB_max) - pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - else { - pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - u->hw_dB_supported = TRUE; + if (u->hw_dB_min >= u->hw_dB_max) + pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + else { + pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + u->hw_dB_supported = TRUE; + + if (u->hw_dB_max > 0) { + u->sink->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0); + pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->sink->base_volume)); + } else + pa_log_info("No particular base volume set, fixing to 0 dB"); + } } - } - if (suitable && - !u->hw_dB_supported && - u->hw_volume_max - u->hw_volume_min < 3) { + if (!u->hw_dB_supported && + u->hw_volume_max - u->hw_volume_min < 3) { - pa_log_info("Device doesn't do dB volume and has less than 4 volume levels. Falling back to software volume control."); - suitable = FALSE; + pa_log_info("Device doesn't do dB volume and has less than 4 volume levels. Falling back to software volume control."); + suitable = FALSE; + } } if (suitable) { diff --git a/src/modules/module-alsa-source.c b/src/modules/module-alsa-source.c index b6c6ed1a..a6e4c907 100644 --- a/src/modules/module-alsa-source.c +++ b/src/modules/module-alsa-source.c @@ -545,9 +545,9 @@ static int update_sw_params(struct userdata *u) { u->hwbuf_unused_frames = (snd_pcm_sframes_t) (PA_LIKELY(b < u->hwbuf_size) ? ((u->hwbuf_size - b) / u->frame_size) : 0); - - fix_tsched_watermark(u); } + + fix_tsched_watermark(u); } pa_log_debug("hwbuf_unused_frames=%lu", (unsigned long) u->hwbuf_unused_frames); @@ -1328,28 +1328,36 @@ int pa__init(pa_module*m) { suitable = TRUE; } - if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) - pa_log_info("Mixer doesn't support dB information."); - else { + if (suitable) { + if (snd_mixer_selem_get_capture_dB_range(u->mixer_elem, &u->hw_dB_min, &u->hw_dB_max) < 0) + pa_log_info("Mixer doesn't support dB information."); + else { #ifdef HAVE_VALGRIND_MEMCHECK_H - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); - VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_min, sizeof(u->hw_dB_min)); + VALGRIND_MAKE_MEM_DEFINED(&u->hw_dB_max, sizeof(u->hw_dB_max)); #endif - if (u->hw_dB_min >= u->hw_dB_max) - pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - else { - pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); - u->hw_dB_supported = TRUE; + if (u->hw_dB_min >= u->hw_dB_max) + pa_log_warn("Your kernel driver is broken: it reports a volume range from %0.2f dB to %0.2f dB which makes no sense.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + else { + pa_log_info("Volume ranges from %0.2f dB to %0.2f dB.", (double) u->hw_dB_min/100.0, (double) u->hw_dB_max/100.0); + u->hw_dB_supported = TRUE; + + if (u->hw_dB_max > 0) { + u->source->base_volume = pa_sw_volume_from_dB(- (double) u->hw_dB_max/100.0); + pa_log_info("Fixing base volume to %0.2f dB", pa_sw_volume_to_dB(u->source->base_volume)); + } else + pa_log_info("No particular base volume set, fixing to 0 dB"); + + } } - } - if (suitable && - !u->hw_dB_supported && - u->hw_volume_max - u->hw_volume_min < 3) { + if (!u->hw_dB_supported && + u->hw_volume_max - u->hw_volume_min < 3) { - pa_log_info("Device has less than 4 volume levels. Falling back to software volume control."); - suitable = FALSE; + pa_log_info("Device has less than 4 volume levels. Falling back to software volume control."); + suitable = FALSE; + } } if (suitable) { diff --git a/src/modules/module-null-sink.c b/src/modules/module-null-sink.c index 470c622e..daf9767c 100644 --- a/src/modules/module-null-sink.c +++ b/src/modules/module-null-sink.c @@ -73,8 +73,6 @@ struct userdata { pa_thread_mq thread_mq; pa_rtpoll *rtpoll; - size_t block_size; - pa_usec_t block_usec; pa_usec_t timestamp; }; @@ -89,7 +87,13 @@ static const char* const valid_modargs[] = { NULL }; -static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offset, pa_memchunk *chunk) { +static int sink_process_msg( + pa_msgobject *o, + int code, + void *data, + int64_t offset, + pa_memchunk *chunk) { + struct userdata *u = PA_SINK(o)->userdata; switch (code) { @@ -104,7 +108,7 @@ static int sink_process_msg(pa_msgobject *o, int code, void *data, int64_t offse pa_usec_t now; now = pa_rtclock_usec(); - *((pa_usec_t*) data) = u->timestamp > now ? u->timestamp - now : 0; + *((pa_usec_t*) data) = u->timestamp > now ? u->timestamp - now : 0ULL; return 0; } @@ -117,10 +121,12 @@ static void sink_update_requested_latency_cb(pa_sink *s) { struct userdata *u; pa_sink_assert_ref(s); - u = s->userdata; - pa_assert(u); + pa_assert_se(u = s->userdata); u->block_usec = pa_sink_get_requested_latency_within_thread(s); + + if (u->block_usec == (pa_usec_t) -1) + u->block_usec = s->thread_info.max_latency; } static void process_rewind(struct userdata *u, pa_usec_t now) { diff --git a/src/modules/module-pipe-source.c b/src/modules/module-pipe-source.c index e6437a05..77310cab 100644 --- a/src/modules/module-pipe-source.c +++ b/src/modules/module-pipe-source.c @@ -226,10 +226,9 @@ int pa__init(pa_module*m) { goto fail; } - u = pa_xnew0(struct userdata, 1); + m->userdata = u = pa_xnew0(struct userdata, 1); u->core = m->core; u->module = m; - m->userdata = u; pa_memchunk_reset(&u->memchunk); u->rtpoll = pa_rtpoll_new(); pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); @@ -264,7 +263,7 @@ int pa__init(pa_module*m) { pa_source_new_data_set_sample_spec(&data, &ss); pa_source_new_data_set_channel_map(&data, &map); - u->source = pa_source_new(m->core, &data, 0); + u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY); pa_source_new_data_done(&data); if (!u->source) { diff --git a/src/modules/module-sine-source.c b/src/modules/module-sine-source.c new file mode 100644 index 00000000..be95cc39 --- /dev/null +++ b/src/modules/module-sine-source.c @@ -0,0 +1,326 @@ +/*** + This file is part of PulseAudio. + + Copyright 2008 Lennart Poettering + + PulseAudio is free software; you can redistribute it and/or modify + it under the terms of the GNU Lesser General Public License as published + by the Free Software Foundation; either version 2 of the License, + or (at your option) any later version. + + PulseAudio is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with PulseAudio; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 + USA. +***/ + +#ifdef HAVE_CONFIG_H +#include <config.h> +#endif + +#include <stdlib.h> +#include <sys/stat.h> +#include <stdio.h> +#include <errno.h> +#include <string.h> +#include <fcntl.h> +#include <unistd.h> +#include <limits.h> +#include <sys/ioctl.h> +#include <sys/poll.h> + +#include <pulse/xmalloc.h> +#include <pulse/timeval.h> + +#include <pulsecore/core-error.h> +#include <pulsecore/source.h> +#include <pulsecore/module.h> +#include <pulsecore/core-util.h> +#include <pulsecore/modargs.h> +#include <pulsecore/log.h> +#include <pulsecore/thread.h> +#include <pulsecore/thread-mq.h> +#include <pulsecore/rtpoll.h> +#include <pulsecore/rtclock.h> + +#include "module-sine-source-symdef.h" + +PA_MODULE_AUTHOR("Lennart Poettering"); +PA_MODULE_DESCRIPTION("Sine wave generator source"); +PA_MODULE_VERSION(PACKAGE_VERSION); +PA_MODULE_LOAD_ONCE(FALSE); +PA_MODULE_USAGE( + "rate=<sample rate> " + "source_name=<name for the source> " + "frequency=<frequency in Hz>"); + +#define DEFAULT_SOURCE_NAME "sine_input" +#define MAX_LATENCY_USEC (PA_USEC_PER_SEC * 2) + +struct userdata { + pa_core *core; + pa_module *module; + pa_source *source; + + pa_thread *thread; + pa_thread_mq thread_mq; + pa_rtpoll *rtpoll; + + pa_memchunk memchunk; + size_t peek_index; + + pa_usec_t block_usec; /* how much to push at once */ + pa_usec_t timestamp; /* when to push next */ +}; + +static const char* const valid_modargs[] = { + "rate", + "source_name", + "frequency", + NULL +}; + +static int source_process_msg( + pa_msgobject *o, + int code, + void *data, + int64_t offset, + pa_memchunk *chunk) { + + struct userdata *u = PA_SOURCE(o)->userdata; + + switch (code) { + + case PA_SINK_MESSAGE_SET_STATE: + + if (PA_PTR_TO_UINT(data) == PA_SINK_RUNNING) + u->timestamp = pa_rtclock_usec(); + + break; + + case PA_SOURCE_MESSAGE_GET_LATENCY: { + pa_usec_t now, left_to_fill; + + now = pa_rtclock_usec(); + left_to_fill = u->timestamp > now ? u->timestamp - now : 0ULL; + + *((pa_usec_t*) data) = u->block_usec > left_to_fill ? u->block_usec - left_to_fill : 0ULL; + + return 0; + } + } + + return pa_source_process_msg(o, code, data, offset, chunk); +} + +static void source_update_requested_latency_cb(pa_source *s) { + struct userdata *u; + + pa_source_assert_ref(s); + pa_assert_se(u = s->userdata); + + u->block_usec = pa_source_get_requested_latency_within_thread(s); + + if (u->block_usec == (pa_usec_t) -1) + u->block_usec = s->thread_info.max_latency; + + pa_log_debug("new block msec = %lu", (unsigned long) (u->block_usec / PA_USEC_PER_MSEC)); +} + +static void process_render(struct userdata *u, pa_usec_t now) { + pa_assert(u); + + while (u->timestamp < now + u->block_usec) { + pa_memchunk chunk; + size_t k; + + k = pa_usec_to_bytes_round_up(now + u->block_usec - u->timestamp, &u->source->sample_spec); + + chunk = u->memchunk; + chunk.index += u->peek_index; + chunk.length = PA_MIN(chunk.length - u->peek_index, k); + +/* pa_log_debug("posting %lu", (unsigned long) chunk.length); */ + pa_source_post(u->source, &chunk); + + u->peek_index += chunk.length; + while (u->peek_index >= u->memchunk.length) + u->peek_index -= u->memchunk.length; + + u->timestamp += pa_bytes_to_usec(chunk.length, &u->source->sample_spec); + } +} + +static void thread_func(void *userdata) { + struct userdata *u = userdata; + + pa_assert(u); + + pa_log_debug("Thread starting up"); + + pa_thread_mq_install(&u->thread_mq); + pa_rtpoll_install(u->rtpoll); + + u->timestamp = pa_rtclock_usec(); + + for (;;) { + int ret; + + if (PA_SOURCE_IS_OPENED(u->source->thread_info.state)) { + pa_usec_t now; + + now = pa_rtclock_usec(); + + if (u->timestamp <= now) + process_render(u, now); + + pa_rtpoll_set_timer_absolute(u->rtpoll, u->timestamp); + } else + pa_rtpoll_set_timer_disabled(u->rtpoll); + + /* Hmm, nothing to do. Let's sleep */ + if ((ret = pa_rtpoll_run(u->rtpoll, TRUE)) < 0) + goto fail; + + if (ret == 0) + goto finish; + } + +fail: + /* If this was no regular exit from the loop we have to continue + * processing messages until we received PA_MESSAGE_SHUTDOWN */ + pa_asyncmsgq_post(u->thread_mq.outq, PA_MSGOBJECT(u->core), PA_CORE_MESSAGE_UNLOAD_MODULE, u->module, 0, NULL, NULL); + pa_asyncmsgq_wait_for(u->thread_mq.inq, PA_MESSAGE_SHUTDOWN); + +finish: + pa_log_debug("Thread shutting down"); +} + +static void calc_sine(float *f, size_t l, double freq) { + size_t i; + + l /= sizeof(float); + + for (i = 0; i < l; i++) + *(f++) = (float) 0.5f * sin((double) i*M_PI*2*freq / (double) l); +} + +int pa__init(pa_module*m) { + struct userdata *u; + pa_modargs *ma; + pa_source_new_data data; + uint32_t frequency; + pa_sample_spec ss; + + pa_assert(m); + + if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { + pa_log("failed to parse module arguments."); + goto fail; + } + + ss.format = PA_SAMPLE_FLOAT32; + ss.channels = 1; + ss.rate = 44100; + + if (pa_modargs_get_value_u32(ma, "rate", &ss.rate) < 0 || ss.rate <= 1) { + pa_log("Invalid rate specification"); + goto fail; + } + + frequency = 440; + if (pa_modargs_get_value_u32(ma, "frequency", &frequency) < 0 || frequency < 1 || frequency > ss.rate/2) { + pa_log("Invalid frequency specification"); + goto fail; + } + + m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; + u->module = m; + u->rtpoll = pa_rtpoll_new(); + pa_thread_mq_init(&u->thread_mq, m->core->mainloop, u->rtpoll); + + u->peek_index = 0; + pa_memchunk_sine(&u->memchunk, m->core->mempool, ss.rate, frequency); + + pa_source_new_data_init(&data); + data.driver = __FILE__; + data.module = m; + pa_source_new_data_set_name(&data, pa_modargs_get_value(ma, "source_name", DEFAULT_SOURCE_NAME)); + pa_proplist_setf(data.proplist, PA_PROP_DEVICE_DESCRIPTION, "Sine source at %u Hz", (unsigned) frequency); + pa_proplist_sets(data.proplist, PA_PROP_DEVICE_CLASS, "abstract"); + pa_proplist_setf(data.proplist, "sine.hz", "%u", frequency); + pa_source_new_data_set_sample_spec(&data, &ss); + + u->source = pa_source_new(m->core, &data, PA_SOURCE_LATENCY); + pa_source_new_data_done(&data); + + if (!u->source) { + pa_log("Failed to create source."); + goto fail; + } + + u->source->parent.process_msg = source_process_msg; + u->source->update_requested_latency = source_update_requested_latency_cb; + u->source->userdata = u; + + pa_source_set_asyncmsgq(u->source, u->thread_mq.inq); + pa_source_set_rtpoll(u->source, u->rtpoll); + + pa_source_set_latency_range(u->source, (pa_usec_t) -1, MAX_LATENCY_USEC); + u->block_usec = u->source->thread_info.max_latency; + + if (!(u->thread = pa_thread_new(thread_func, u))) { + pa_log("Failed to create thread."); + goto fail; + } + + pa_source_put(u->source); + + pa_modargs_free(ma); + + return 0; + +fail: + if (ma) + pa_modargs_free(ma); + + pa__done(m); + + return -1; +} + +void pa__done(pa_module*m) { + struct userdata *u; + + pa_assert(m); + + if (!(u = m->userdata)) + return; + + if (u->source) + pa_source_unlink(u->source); + + if (u->thread) { + pa_asyncmsgq_send(u->thread_mq.inq, NULL, PA_MESSAGE_SHUTDOWN, NULL, 0, NULL); + pa_thread_free(u->thread); + } + + pa_thread_mq_done(&u->thread_mq); + + if (u->source) + pa_source_unref(u->source); + + if (u->memchunk.memblock) + pa_memblock_unref(u->memchunk.memblock); + + if (u->rtpoll) + pa_rtpoll_free(u->rtpoll); + + pa_xfree(u); +} diff --git a/src/modules/module-sine.c b/src/modules/module-sine.c index 21565cc4..3b0dc352 100644 --- a/src/modules/module-sine.c +++ b/src/modules/module-sine.c @@ -41,13 +41,15 @@ PA_MODULE_AUTHOR("Lennart Poettering"); PA_MODULE_DESCRIPTION("Sine wave generator"); PA_MODULE_VERSION(PACKAGE_VERSION); PA_MODULE_LOAD_ONCE(FALSE); -PA_MODULE_USAGE("sink=<sink to connect to> frequency=<frequency in Hz>"); +PA_MODULE_USAGE( + "sink=<sink to connect to> " + "frequency=<frequency in Hz>"); struct userdata { pa_core *core; pa_module *module; pa_sink_input *sink_input; - pa_memblock *memblock; + pa_memchunk memchunk; size_t peek_index; }; @@ -64,9 +66,11 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk pa_assert_se(u = i->userdata); pa_assert(chunk); - chunk->memblock = pa_memblock_ref(u->memblock); - chunk->length = pa_memblock_get_length(u->memblock) - u->peek_index; - chunk->index = u->peek_index; + *chunk = u->memchunk; + pa_memblock_ref(chunk->memblock); + + chunk->index += u->peek_index; + chunk->length -= u->peek_index; u->peek_index = 0; @@ -74,19 +78,17 @@ static int sink_input_pop_cb(pa_sink_input *i, size_t nbytes, pa_memchunk *chunk } static void sink_input_process_rewind_cb(pa_sink_input *i, size_t nbytes) { - size_t l; struct userdata *u; pa_sink_input_assert_ref(i); pa_assert_se(u = i->userdata); - l = pa_memblock_get_length(u->memblock); - nbytes %= l; + nbytes %= u->memchunk.length; if (u->peek_index >= nbytes) u->peek_index -= nbytes; else - u->peek_index = l + u->peek_index - nbytes; + u->peek_index = u->memchunk.length + u->peek_index - nbytes; } static void sink_input_kill_cb(pa_sink_input *i) { @@ -116,22 +118,12 @@ static void sink_input_state_change_cb(pa_sink_input *i, pa_sink_input_state_t s pa_sink_input_request_rewind(i, 0, FALSE, TRUE); } -static void calc_sine(float *f, size_t l, double freq) { - size_t i; - - l /= sizeof(float); - - for (i = 0; i < l; i++) - f[i] = (float) sin((double) i/(double)l*M_PI*2*freq)/2; -} - int pa__init(pa_module*m) { pa_modargs *ma = NULL; struct userdata *u; pa_sink *sink; pa_sample_spec ss; uint32_t frequency; - void *p; pa_sink_input_new_data data; if (!(ma = pa_modargs_new(m->argument, valid_modargs))) { @@ -139,14 +131,7 @@ int pa__init(pa_module*m) { goto fail; } - m->userdata = u = pa_xnew0(struct userdata, 1); - u->core = m->core; - u->module = m; - u->sink_input = NULL; - u->memblock = NULL; - u->peek_index = 0; - - if (!(sink = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink", NULL), PA_NAMEREG_SINK, 1))) { + if (!(sink = pa_namereg_get(m->core, pa_modargs_get_value(ma, "sink", NULL), PA_NAMEREG_SINK, TRUE))) { pa_log("No such sink."); goto fail; } @@ -161,19 +146,22 @@ int pa__init(pa_module*m) { goto fail; } - u->memblock = pa_memblock_new(m->core->mempool, pa_bytes_per_second(&ss)); - p = pa_memblock_acquire(u->memblock); - calc_sine(p, pa_memblock_get_length(u->memblock), (double) frequency); - pa_memblock_release(u->memblock); + m->userdata = u = pa_xnew0(struct userdata, 1); + u->core = m->core; + u->module = m; + u->sink_input = NULL; + + u->peek_index = 0; + pa_memchunk_sine(&u->memchunk, m->core->mempool, ss.rate, frequency); pa_sink_input_new_data_init(&data); - data.sink = sink; data.driver = __FILE__; + data.module = m; + data.sink = sink; pa_proplist_setf(data.proplist, PA_PROP_MEDIA_NAME, "%u Hz Sine", frequency); pa_proplist_sets(data.proplist, PA_PROP_MEDIA_ROLE, "abstract"); pa_proplist_setf(data.proplist, "sine.hz", "%u", frequency); pa_sink_input_new_data_set_sample_spec(&data, &ss); - data.module = m; u->sink_input = pa_sink_input_new(m->core, &data, 0); pa_sink_input_new_data_done(&data); @@ -213,8 +201,8 @@ void pa__done(pa_module*m) { pa_sink_input_unref(u->sink_input); } - if (u->memblock) - pa_memblock_unref(u->memblock); + if (u->memchunk.memblock) + pa_memblock_unref(u->memchunk.memblock); pa_xfree(u); } |