Menu
▾
▴
[gst-cvs] gst-plugins-good: pulse: rename pa_buffer_attr variables
|
From: <cy...@ke...> - 2009-10-02 20:39:25
|
Module: gst-plugins-good Branch: master Commit: ccddf0643df1f2fc0b4736dc655c89d5e973433b URL: http://cgit.freedesktop.org/gstreamer/gst-plugins-good/commit/?id=ccddf0643df1f2fc0b4736dc655c89d5e973433b Author: René Stadler <ma...@re...> Date: Fri Oct 2 22:55:45 2009 +0300 pulse: rename pa_buffer_attr variables Makes it much easier to see what is going on and is a lot less error prone. --- ext/pulse/pulsesink.c | 42 +++++++++++++++++++++--------------------- ext/pulse/pulsesrc.c | 44 ++++++++++++++++++++++---------------------- 2 files changed, 43 insertions(+), 43 deletions(-) diff --git a/ext/pulse/pulsesink.c b/ext/pulse/pulsesink.c index 10fa884..51f19e7 100644 --- a/ext/pulse/pulsesink.c +++ b/ext/pulse/pulsesink.c @@ -599,8 +599,8 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) { GstPulseSink *psink; GstPulseRingBuffer *pbuf; - pa_buffer_attr buf_attr; - const pa_buffer_attr *buf_attr_ptr; + pa_buffer_attr wanted; + const pa_buffer_attr *actual; pa_channel_map channel_map; pa_operation *o = NULL; pa_cvolume v, *pv; @@ -663,16 +663,16 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) /* buffering requirements. When setting prebuf to 0, the stream will not pause * when we cause an underrun, which causes time to continue. */ - memset (&buf_attr, 0, sizeof (buf_attr)); - buf_attr.tlength = spec->segtotal * spec->segsize; - buf_attr.maxlength = -1; - buf_attr.prebuf = 0; - buf_attr.minreq = -1; + memset (&wanted, 0, sizeof (wanted)); + wanted.tlength = spec->segtotal * spec->segsize; + wanted.maxlength = -1; + wanted.prebuf = 0; + wanted.minreq = -1; - GST_INFO_OBJECT (psink, "tlength: %d", buf_attr.tlength); - GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr.maxlength); - GST_INFO_OBJECT (psink, "prebuf: %d", buf_attr.prebuf); - GST_INFO_OBJECT (psink, "minreq: %d", buf_attr.minreq); + GST_INFO_OBJECT (psink, "tlength: %d", wanted.tlength); + GST_INFO_OBJECT (psink, "maxlength: %d", wanted.maxlength); + GST_INFO_OBJECT (psink, "prebuf: %d", wanted.prebuf); + GST_INFO_OBJECT (psink, "minreq: %d", wanted.minreq); /* configure volume when we changed it, else we leave the default */ if (psink->volume_set) { @@ -703,7 +703,7 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) GST_LOG_OBJECT (psink, "connect for playback to device %s", GST_STR_NULL (psink->device)); if (pa_stream_connect_playback (pbuf->stream, psink->device, - &buf_attr, flags, pv, NULL) < 0) + &wanted, flags, pv, NULL) < 0) goto connect_failed; /* our clock will now start from 0 again */ @@ -730,17 +730,17 @@ gst_pulseringbuffer_acquire (GstRingBuffer * buf, GstRingBufferSpec * spec) GST_LOG_OBJECT (psink, "stream is acquired now"); /* get the actual buffering properties now */ - buf_attr_ptr = pa_stream_get_buffer_attr (pbuf->stream); + actual = pa_stream_get_buffer_attr (pbuf->stream); - GST_INFO_OBJECT (psink, "tlength: %d (wanted: %d)", buf_attr_ptr->tlength, - buf_attr.tlength); - GST_INFO_OBJECT (psink, "maxlength: %d", buf_attr_ptr->maxlength); - GST_INFO_OBJECT (psink, "prebuf: %d", buf_attr_ptr->prebuf); - GST_INFO_OBJECT (psink, "minreq: %d (wanted %d)", buf_attr_ptr->minreq, - buf_attr.minreq); + GST_INFO_OBJECT (psink, "tlength: %d (wanted: %d)", actual->tlength, + wanted.tlength); + GST_INFO_OBJECT (psink, "maxlength: %d", actual->maxlength); + GST_INFO_OBJECT (psink, "prebuf: %d", actual->prebuf); + GST_INFO_OBJECT (psink, "minreq: %d (wanted %d)", actual->minreq, + wanted.minreq); - spec->segsize = buf_attr_ptr->minreq; - spec->segtotal = buf_attr_ptr->tlength / spec->segsize; + spec->segsize = actual->minreq; + spec->segtotal = actual->tlength / spec->segsize; pa_threaded_mainloop_unlock (psink->mainloop); diff --git a/ext/pulse/pulsesrc.c b/ext/pulse/pulsesrc.c index 43ec91e..1da7936 100644 --- a/ext/pulse/pulsesrc.c +++ b/ext/pulse/pulsesrc.c @@ -950,25 +950,25 @@ no_nego_needed: static gboolean gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec) { - pa_buffer_attr buf_attr; - const pa_buffer_attr *buf_attr_ptr; + pa_buffer_attr wanted; + const pa_buffer_attr *actual; GstPulseSrc *pulsesrc = GST_PULSESRC_CAST (asrc); pa_threaded_mainloop_lock (pulsesrc->mainloop); - buf_attr.maxlength = -1; - buf_attr.tlength = -1; - buf_attr.prebuf = 0; - buf_attr.minreq = -1; - buf_attr.fragsize = spec->segsize; + wanted.maxlength = -1; + wanted.tlength = -1; + wanted.prebuf = 0; + wanted.minreq = -1; + wanted.fragsize = spec->segsize; - GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr.maxlength); - GST_INFO_OBJECT (pulsesrc, "tlength: %d", buf_attr.tlength); - GST_INFO_OBJECT (pulsesrc, "prebuf: %d", buf_attr.prebuf); - GST_INFO_OBJECT (pulsesrc, "minreq: %d", buf_attr.minreq); - GST_INFO_OBJECT (pulsesrc, "fragsize: %d", buf_attr.fragsize); + GST_INFO_OBJECT (pulsesrc, "maxlength: %d", wanted.maxlength); + GST_INFO_OBJECT (pulsesrc, "tlength: %d", wanted.tlength); + GST_INFO_OBJECT (pulsesrc, "prebuf: %d", wanted.prebuf); + GST_INFO_OBJECT (pulsesrc, "minreq: %d", wanted.minreq); + GST_INFO_OBJECT (pulsesrc, "fragsize: %d", wanted.fragsize); - if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &buf_attr, + if (pa_stream_connect_record (pulsesrc->stream, pulsesrc->device, &wanted, PA_STREAM_INTERPOLATE_TIMING | PA_STREAM_AUTO_TIMING_UPDATE | PA_STREAM_NOT_MONOTONOUS | #if HAVE_PULSE_0_9_11 @@ -1003,20 +1003,20 @@ gst_pulsesrc_prepare (GstAudioSrc * asrc, GstRingBufferSpec * spec) } /* get the actual buffering properties now */ - buf_attr_ptr = pa_stream_get_buffer_attr (pulsesrc->stream); + actual = pa_stream_get_buffer_attr (pulsesrc->stream); - GST_INFO_OBJECT (pulsesrc, "maxlength: %d", buf_attr_ptr->maxlength); + GST_INFO_OBJECT (pulsesrc, "maxlength: %d", actual->maxlength); GST_INFO_OBJECT (pulsesrc, "tlength: %d (wanted: %d)", - buf_attr_ptr->tlength, buf_attr.tlength); - GST_INFO_OBJECT (pulsesrc, "prebuf: %d", buf_attr_ptr->prebuf); - GST_INFO_OBJECT (pulsesrc, "minreq: %d (wanted %d)", buf_attr_ptr->minreq, - buf_attr.minreq); + actual->tlength, wanted.tlength); + GST_INFO_OBJECT (pulsesrc, "prebuf: %d", actual->prebuf); + GST_INFO_OBJECT (pulsesrc, "minreq: %d (wanted %d)", actual->minreq, + wanted.minreq); GST_INFO_OBJECT (pulsesrc, "fragsize: %d (wanted %d)", - buf_attr_ptr->fragsize, buf_attr.fragsize); + actual->fragsize, wanted.fragsize); /* adjust latency again */ - spec->segsize = buf_attr_ptr->fragsize; - spec->segtotal = buf_attr_ptr->maxlength / spec->segsize; + spec->segsize = actual->fragsize; + spec->segtotal = actual->maxlength / spec->segsize; pa_threaded_mainloop_unlock (pulsesrc->mainloop); |