From 4e0c846fa4ebde19203c3f3d8ecab7523fb563fa Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Thu, 9 Feb 2006 11:46:03 +0000 Subject: [PATCH] kapowpowpow Original commit message from CVS: kapowpowpow --- gst-libs/gst/audio/gstringbuffer.c | 32 +++++++++++++++++++----------- win32/common/config.h | 4 ++-- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/gst-libs/gst/audio/gstringbuffer.c b/gst-libs/gst/audio/gstringbuffer.c index c8c65977e9..f9dbf524ec 100644 --- a/gst-libs/gst/audio/gstringbuffer.c +++ b/gst-libs/gst/audio/gstringbuffer.c @@ -980,7 +980,7 @@ gst_ring_buffer_samples_done (GstRingBuffer * buf) /* and the number of samples not yet processed */ delay = gst_ring_buffer_delay (buf); - samples = ((guint64) segdone) * buf->samples_per_seg); + samples = ((guint64) segdone) * buf->samples_per_seg; raw = samples; if (samples >= delay) @@ -1006,7 +1006,8 @@ gst_ring_buffer_samples_done (GstRingBuffer * buf) * * MT safe. */ -void gst_ring_buffer_set_sample (GstRingBuffer * buf, guint64 sample) +void +gst_ring_buffer_set_sample (GstRingBuffer * buf, guint64 sample) { g_return_if_fail (buf != NULL); @@ -1035,7 +1036,8 @@ void gst_ring_buffer_set_sample (GstRingBuffer * buf, guint64 sample) * * MT safe. */ -void gst_ring_buffer_clear_all (GstRingBuffer * buf) +void +gst_ring_buffer_clear_all (GstRingBuffer * buf) { gint i; @@ -1053,7 +1055,8 @@ void gst_ring_buffer_clear_all (GstRingBuffer * buf) } -static gboolean wait_segment (GstRingBuffer * buf) +static gboolean +wait_segment (GstRingBuffer * buf) { /* buffer must be started now or we deadlock since nobody is reading */ if (g_atomic_int_get (&buf->state) != GST_RING_BUFFER_STATE_STARTED) { @@ -1117,8 +1120,9 @@ flushing: * MT safe. */ guint - gst_ring_buffer_commit (GstRingBuffer * buf, guint64 sample, guchar * data, - guint len) { +gst_ring_buffer_commit (GstRingBuffer * buf, guint64 sample, guchar * data, + guint len) +{ gint segdone; gint segsize, segtotal, bps, sps; guint8 *dest; @@ -1223,8 +1227,9 @@ not_started: * MT safe. */ guint - gst_ring_buffer_read (GstRingBuffer * buf, guint64 sample, guchar * data, - guint len) { +gst_ring_buffer_read (GstRingBuffer * buf, guint64 sample, guchar * data, + guint len) +{ gint segdone; gint segsize, segtotal, bps, sps; guint8 *dest; @@ -1328,8 +1333,9 @@ not_started: * MT safe. */ gboolean - gst_ring_buffer_prepare_read (GstRingBuffer * buf, gint * segment, - guint8 ** readptr, gint * len) { +gst_ring_buffer_prepare_read (GstRingBuffer * buf, gint * segment, + guint8 ** readptr, gint * len) +{ guint8 *data; gint segdone; @@ -1372,7 +1378,8 @@ gboolean * * MT safe. */ -void gst_ring_buffer_advance (GstRingBuffer * buf, guint advance) +void +gst_ring_buffer_advance (GstRingBuffer * buf, guint advance) { g_return_if_fail (buf != NULL); @@ -1400,7 +1407,8 @@ void gst_ring_buffer_advance (GstRingBuffer * buf, guint advance) * * MT safe. */ -void gst_ring_buffer_clear (GstRingBuffer * buf, gint segment) +void +gst_ring_buffer_clear (GstRingBuffer * buf, gint segment) { guint8 *data; diff --git a/win32/common/config.h b/win32/common/config.h index 04d485130f..440a7e674a 100644 --- a/win32/common/config.h +++ b/win32/common/config.h @@ -42,7 +42,7 @@ #define GST_PACKAGE_ORIGIN "Unknown package origin" /* package name in plugins */ -#define GST_PACKAGE_NAME "GStreamer Base Plug-ins source release" +#define GST_PACKAGE_NAME "GStreamer Base Plug-ins CVS/prerelease" /* Define the version */ #define GST_VERSION "@GST_VERSION@" @@ -250,7 +250,7 @@ #undef STDC_HEADERS /* Version number of package */ -#define VERSION "0.10.3" +#define VERSION "0.10.3.1" /* Define to 1 if your processor stores words with the most significant byte first (like Motorola and SPARC, unlike Intel and VAX). */