From dc48eaac1384b3d91749399b78de696933272b17 Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Tue, 1 Mar 2011 14:08:12 +0530 Subject: [PATCH] pulsesink: Always call pa_stream_new_with_proplist() pa_stream_new_with_proplist() can take a NULL proplist, so we don't need to concern ourselves with whether it's NULL or not. --- ext/pulse/pulsesink.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c index 79c5ea82c5..d93e5c890a 100644 --- a/ext/pulse/pulsesink.c +++ b/ext/pulse/pulsesink.c @@ -783,12 +783,8 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) /* create a stream */ GST_LOG_OBJECT (psink, "creating stream with name %s", name); - if (psink->proplist) { - if (!(pbuf->stream = pa_stream_new_with_proplist (pbuf->context, - name, &pbuf->sample_spec, &channel_map, psink->proplist))) - goto stream_failed; - } else if (!(pbuf->stream = pa_stream_new (pbuf->context, - name, &pbuf->sample_spec, &channel_map))) + if (!(pbuf->stream = pa_stream_new_with_proplist (pbuf->context, name, + &pbuf->sample_spec, &channel_map, psink->proplist))) goto stream_failed; /* install essential callbacks */