From c2f6d090c795bba9ef405908cee06bba79a87f1f Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 1 Apr 2009 03:03:20 +0200 Subject: don't access i->sink if it is not set --- src/pulsecore/source-output.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/pulsecore/source-output.c') diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 550b6571..5c240063 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -542,10 +542,12 @@ pa_usec_t pa_source_output_set_requested_latency(pa_source_output *o, pa_usec_t /* If this source output is not realized yet or is being moved, we * have to touch the thread info data directly */ - pa_source_get_latency_range(o->source, &min_latency, &max_latency); + if (o->source) { + pa_source_get_latency_range(o->source, &min_latency, &max_latency); - if (usec != (pa_usec_t) -1) - usec = PA_CLAMP(usec, min_latency, max_latency); + if (usec != (pa_usec_t) -1) + usec = PA_CLAMP(usec, min_latency, max_latency); + } o->thread_info.requested_source_latency = usec; -- cgit From 75a8d18285f247b8a15dda8a3b545455d564d119 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Wed, 1 Apr 2009 03:04:39 +0200 Subject: pass destination source/sink when moving streams so that we can access them --- src/pulsecore/source-output.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/pulsecore/source-output.c') diff --git a/src/pulsecore/source-output.c b/src/pulsecore/source-output.c index 5c240063..27f24cd1 100644 --- a/src/pulsecore/source-output.c +++ b/src/pulsecore/source-output.c @@ -747,7 +747,7 @@ int pa_source_output_finish_move(pa_source_output *o, pa_source *dest, pa_bool_t new_resampler = NULL; if (o->moving) - o->moving(o); + o->moving(o, dest); o->source = dest; o->save_source = save; -- cgit