From 69edaac422d50a0e365fae15d354c07c0f5419d4 Mon Sep 17 00:00:00 2001 From: Leif Johnson Date: Wed, 8 Oct 2003 07:50:58 +0000 Subject: just some code cleanup Original commit message from CVS: just some code cleanup --- gst/speed/gstspeed.h | 28 +++++++++------------------- 1 file changed, 9 insertions(+), 19 deletions(-) (limited to 'gst/speed/gstspeed.h') diff --git a/gst/speed/gstspeed.h b/gst/speed/gstspeed.h index d56c0756..51258303 100644 --- a/gst/speed/gstspeed.h +++ b/gst/speed/gstspeed.h @@ -22,23 +22,20 @@ #ifndef __GST_SPEED_H__ #define __GST_SPEED_H__ +#ifdef HAVE_CONFIG_H +# include "config.h" +#endif -#include #include -/* #include */ - - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ +G_BEGIN_DECLS #define GST_TYPE_SPEED \ (gst_speed_get_type()) #define GST_SPEED(obj) \ (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_SPEED,GstSpeed)) #define GST_SPEED_CLASS(klass) \ - (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_ULAW,GstSpeed)) + (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_SPEED,GstSpeed)) #define GST_IS_SPEED(obj) \ (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_SPEED)) #define GST_IS_SPEED_CLASS(obj) \ @@ -59,23 +56,19 @@ struct _GstSpeed { GstPad *sinkpad, *srcpad; GstBufferPool *sinkpool, *srcpool; - gboolean silent; gfloat speed; - /* the next are valid for both int and float */ + /* valid for both int and float */ GstSpeedFormat format; guint rate; guint channels; guint width; guint endianness; + guint buffer_frames; - /* the next are valid only for format==GST_SPEED_FORMAT_INT */ + /* valid only for format==GST_SPEED_FORMAT_INT */ guint depth; gboolean is_signed; - - /* the next three are valid only for format==GST_SPEED_FORMAT_FLOAT */ - gfloat slope; - gfloat intercept; }; struct _GstSpeedClass { @@ -84,9 +77,6 @@ struct _GstSpeedClass { GType gst_speed_get_type(void); -#ifdef __cplusplus -} -#endif /* __cplusplus */ - +G_END_DECLS #endif /* __GST_SPEED_H__ */ -- cgit v1.2.1