whitespace cleanup

Original commit message from CVS:
whitespace cleanup
This commit is contained in:
Thomas Vander Stichele 2005-08-22 09:35:57 +00:00
parent 9eb7c68f13
commit 6d828d3b93
2 changed files with 14 additions and 18 deletions

View File

@ -1,4 +1,6 @@
/* -*- c-basic-offset: 2 -*- /* -*- c-basic-offset: 2 -*-
* vi:si:et:sw=2:sts=8:ts=8:expandtab
*
* GStreamer * GStreamer
* Copyright (C) 1999-2001 Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) 1999-2001 Erik Walthinsen <omega@cse.ogi.edu>
* Copyright (C) 2005 Andy Wingo <wingo@pobox.com> * Copyright (C) 2005 Andy Wingo <wingo@pobox.com>
@ -22,6 +24,7 @@
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
#include "config.h" #include "config.h"
#endif #endif
#include <string.h> #include <string.h>
#include <gst/gst.h> #include <gst/gst.h>
#include <gst/base/gstbasetransform.h> #include <gst/base/gstbasetransform.h>
@ -33,15 +36,14 @@
/* the volume factor is a range from 0.0 to (arbitrary) 4.0 /* the volume factor is a range from 0.0 to (arbitrary) 4.0
* we map 1.0 to VOLUME_UNITY_INT * we map 1.0 to VOLUME_UNITY_INT
*/ */
#define VOLUME_UNITY_INT 8192 /* internal int for unity */ #define VOLUME_UNITY_INT 8192 /* internal int for unity */
#define VOLUME_UNITY_BIT_SHIFT 13 /* number of bits to shift #define VOLUME_UNITY_BIT_SHIFT 13 /* number of bits to shift for unity */
for unity */ #define VOLUME_MAX_DOUBLE 4.0
#define VOLUME_MAX_DOUBLE 4.0 #define VOLUME_MAX_INT16 32767
#define VOLUME_MAX_INT16 32767 #define VOLUME_MIN_INT16 -32768
#define VOLUME_MIN_INT16 -32768
/* number of steps we use for the mixer interface to go from 0.0 to 1.0 */ /* number of steps we use for the mixer interface to go from 0.0 to 1.0 */
# define VOLUME_STEPS 100 # define VOLUME_STEPS 100
static GstElementDetails volume_details = { static GstElementDetails volume_details = {
"Volume", "Volume",
@ -50,7 +52,6 @@ static GstElementDetails volume_details = {
"Andy Wingo <wingo@pobox.com>", "Andy Wingo <wingo@pobox.com>",
}; };
/* Filter signals and args */ /* Filter signals and args */
enum enum
{ {
@ -102,7 +103,7 @@ static GstStaticPadTemplate volume_src_factory = GST_STATIC_PAD_TEMPLATE ("src",
static void gst_volume_interface_init (GstImplementsInterfaceClass * klass); static void gst_volume_interface_init (GstImplementsInterfaceClass * klass);
static void gst_volume_mixer_init (GstMixerClass * iface); static void gst_volume_mixer_init (GstMixerClass * iface);
#define _init_interfaces(type) \ #define _init_interfaces(type) \
{ \ { \
static const GInterfaceInfo voliface_info = { \ static const GInterfaceInfo voliface_info = { \
(GInterfaceInitFunc) gst_volume_interface_init, \ (GInterfaceInitFunc) gst_volume_interface_init, \
@ -135,7 +136,6 @@ static GstFlowReturn volume_transform (GstBaseTransform * base,
gboolean volume_set_caps (GstBaseTransform * base, GstCaps * incaps, gboolean volume_set_caps (GstBaseTransform * base, GstCaps * incaps,
GstCaps * outcaps); GstCaps * outcaps);
static void volume_process_float (GstVolume * this, GstClockTime tstamp, static void volume_process_float (GstVolume * this, GstClockTime tstamp,
gpointer bytes, gint n_bytes); gpointer bytes, gint n_bytes);
static void volume_process_int16 (GstVolume * this, GstClockTime tstamp, static void volume_process_int16 (GstVolume * this, GstClockTime tstamp,

View File

@ -1,4 +1,6 @@
/* -*- c-basic-offset: 2 -*- /* -*- c-basic-offset: 2 -*-
* vi:si:et:sw=2:sts=8:ts=8:expandtab
*
* GStreamer * GStreamer
* Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu> * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
* *
@ -18,17 +20,13 @@
* Boston, MA 02111-1307, USA. * Boston, MA 02111-1307, USA.
*/ */
#ifndef __GST_VOLUME_H__ #ifndef __GST_VOLUME_H__
#define __GST_VOLUME_H__ #define __GST_VOLUME_H__
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_VOLUME \ #define GST_TYPE_VOLUME \
(gst_volume_get_type()) (gst_volume_get_type())
#define GST_VOLUME(obj) \ #define GST_VOLUME(obj) \
@ -56,7 +54,7 @@ struct _GstVolume {
gboolean mute; gboolean mute;
gint volume_i, real_vol_i; /* the _i(nt) values get synchronized with the */ gint volume_i, real_vol_i; /* the _i(nt) values get synchronized with the */
gfloat volume_f, real_vol_f; /* _f(loat) values on each update */ gfloat volume_f, real_vol_f; /* _f(loat) values on each update */
GList *tracklist; GList *tracklist;
}; };
@ -64,10 +62,8 @@ struct _GstVolumeClass {
GstBaseTransformClass parent_class; GstBaseTransformClass parent_class;
}; };
GType gst_volume_get_type(void); GType gst_volume_get_type (void);
G_END_DECLS G_END_DECLS
#endif /* __GST_VOLUME_H__ */ #endif /* __GST_VOLUME_H__ */