From 22ebcc3091b84f0082581ee30a944da993fc5bc7 Mon Sep 17 00:00:00 2001 From: Stefan Kost Date: Mon, 11 Sep 2006 18:23:59 +0000 Subject: [PATCH] gst/spectrum/gstspectrum.*: Fix type mixup in spectrum->interval (gdouble<->guint64). Spotted by MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Original commit message from CVS: * gst/spectrum/gstspectrum.c: (gst_spectrum_init), (gst_spectrum_set_property): * gst/spectrum/gstspectrum.h: Fix type mixup in spectrum->interval (gdouble<->guint64). Spotted by René Stadler --- ChangeLog | 8 ++++++++ gst/spectrum/gstspectrum.c | 3 ++- gst/spectrum/gstspectrum.h | 2 +- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 17e2a97bb8..4560643b7d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2006-09-11 Stefan Kost + + * gst/spectrum/gstspectrum.c: (gst_spectrum_init), + (gst_spectrum_set_property): + * gst/spectrum/gstspectrum.h: + Fix type mixup in spectrum->interval (gdouble<->guint64). Spotted by + René Stadler + 2006-09-11 Stefan Kost * gst/spectrum/demo-osssrc.c: (draw_spectrum), (main): diff --git a/gst/spectrum/gstspectrum.c b/gst/spectrum/gstspectrum.c index d03024dee2..ae3645bbfb 100644 --- a/gst/spectrum/gstspectrum.c +++ b/gst/spectrum/gstspectrum.c @@ -208,6 +208,7 @@ gst_spectrum_init (GstSpectrum * spectrum, GstSpectrumClass * g_class) spectrum->adapter = gst_adapter_new (); + spectrum->interval = GST_SECOND / 10; spectrum->bands = 128; spectrum->base = 9; spectrum->len = 1024; /* 2 ^ (base+1) */ @@ -252,7 +253,7 @@ gst_spectrum_set_property (GObject * object, guint prop_id, filter->message = g_value_get_boolean (value); break; case PROP_SIGNAL_INTERVAL: - filter->interval = gst_guint64_to_gdouble (g_value_get_uint64 (value)); + filter->interval = g_value_get_uint64 (value); break; case PROP_BANDS: filter->bands = g_value_get_uint (value); diff --git a/gst/spectrum/gstspectrum.h b/gst/spectrum/gstspectrum.h index 0092f0bae4..3bfdd48995 100644 --- a/gst/spectrum/gstspectrum.h +++ b/gst/spectrum/gstspectrum.h @@ -48,7 +48,7 @@ struct _GstSpectrum { /* properties */ gboolean message; /* whether or not to post messages */ - gdouble interval; /* how many seconds between emits */ + guint64 interval; /* how many seconds between emits */ guint bands; /* number of spectrum bands */ gint threshold; /* energy level treshold */