From: <sl...@ke...> - 2008-08-18 15:05:37
|
CVS Root: /cvs/gstreamer Module: gst-plugins-good Changes by: slomo Date: Mon Aug 18 2008 15:05:46 UTC Log message: * ext/pulse/pulsesink.c: (gst_pulsesink_prepare): * ext/pulse/pulsesrc.c: (gst_pulsesrc_prepare): The bytes_per_sample and silence_sample fields of the GstRingBufferSpec are already filled with the correct values by gst_ring_buffer_parse_caps() so there's no need to set them again with wrong values. Modified files: . : ChangeLog ext/pulse : pulsesink.c pulsesrc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ChangeLog.diff?r1=1.3680&r2=1.3681 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsesink.c.diff?r1=1.6&r2=1.7 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-good/ext/pulse/pulsesrc.c.diff?r1=1.6&r2=1.7 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-good/ChangeLog,v retrieving revision 1.3680 retrieving revision 1.3681 diff -u -d -r1.3680 -r1.3681 --- ChangeLog 16 Aug 2008 14:54:55 -0000 1.3680 +++ ChangeLog 18 Aug 2008 15:05:30 -0000 1.3681 @@ -1,3 +1,12 @@ +2008-08-18 Sebastian Dröge <seb...@co...> + + * ext/pulse/pulsesink.c: (gst_pulsesink_prepare): + * ext/pulse/pulsesrc.c: (gst_pulsesrc_prepare): + The bytes_per_sample and silence_sample fields of the GstRingBufferSpec + are already filled with the correct values by + gst_ring_buffer_parse_caps() so there's no need to set them again + with wrong values. 2008-08-16 Edward Hervey <edw...@co...> * gst/avi/gstavidemux.c: (gst_avi_demux_read_subindexes_pull), Index: pulsesink.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsesink.c,v retrieving revision 1.6 retrieving revision 1.7 diff -u -d -r1.6 -r1.7 --- pulsesink.c 13 Aug 2008 13:57:01 -0000 1.6 +++ pulsesink.c 18 Aug 2008 15:05:32 -0000 1.7 @@ -584,16 +584,14 @@ if (!pulsesink->context || pa_context_get_state (pulsesink->context) != PA_CONTEXT_READY) { GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Bad context state: %s", - pulsesink-> - context ? pa_strerror (pa_context_errno (pulsesink->context)) : - NULL), (NULL)); + pulsesink->context ? pa_strerror (pa_context_errno (pulsesink-> + context)) : NULL), (NULL)); goto unlock_and_fail; } if (!(pulsesink->stream = pa_stream_new (pulsesink->context, - pulsesink-> - stream_name ? pulsesink->stream_name : "Playback Stream", - &pulsesink->sample_spec, + pulsesink->stream_name ? pulsesink-> + stream_name : "Playback Stream", &pulsesink->sample_spec, gst_pulse_gst_to_channel_map (&channel_map, spec)))) { GST_ELEMENT_ERROR (pulsesink, RESOURCE, FAILED, ("Failed to create stream: %s", @@ -636,9 +634,6 @@ pa_threaded_mainloop_unlock (pulsesink->mainloop); - spec->bytes_per_sample = pa_frame_size (&pulsesink->sample_spec); - memset (spec->silence_sample, 0, spec->bytes_per_sample); - #if 0 gst_pulsesink_set_volume (pulsesink, pulsesink->volume); #endif Index: pulsesrc.c RCS file: /cvs/gstreamer/gst-plugins-good/ext/pulse/pulsesrc.c,v --- pulsesrc.c 13 Aug 2008 12:37:26 -0000 1.6 +++ pulsesrc.c 18 Aug 2008 15:05:32 -0000 1.7 @@ -509,8 +509,9 @@ if (!pulsesrc->context || pa_context_get_state (pulsesrc->context) != PA_CONTEXT_READY) { GST_ELEMENT_ERROR (pulsesrc, RESOURCE, FAILED, ("Bad context state: %s", - pulsesrc->context ? pa_strerror (pa_context_errno (pulsesrc-> - context)) : NULL), (NULL)); + pulsesrc-> + context ? pa_strerror (pa_context_errno (pulsesrc->context)) : + NULL), (NULL)); @@ -554,9 +555,6 @@ pa_threaded_mainloop_unlock (pulsesrc->mainloop); - spec->bytes_per_sample = pa_frame_size (&pulsesrc->sample_spec); return TRUE; unlock_and_fail: |