diff options
author | Johan Dahlin <johan@gnome.org> | 2004-03-15 16:32:54 +0000 |
---|---|---|
committer | Johan Dahlin <johan@gnome.org> | 2004-03-15 16:32:54 +0000 |
commit | 5acffea623eaa95469a8fb77260c85240c6c0a41 (patch) | |
tree | 5d1eb5b3c6cbe7ff7888cfe0b2f972f7e509e99d /sys/oss | |
parent | f878cc16402dcc70f31861bb120f435f3157c518 (diff) |
*.h: Revert indenting
Original commit message from CVS:
* *.h: Revert indenting
Diffstat (limited to 'sys/oss')
-rw-r--r-- | sys/oss/gstosselement.h | 82 | ||||
-rw-r--r-- | sys/oss/gstossmixer.h | 23 | ||||
-rw-r--r-- | sys/oss/gstosssink.h | 40 | ||||
-rw-r--r-- | sys/oss/gstosssrc.h | 30 |
4 files changed, 92 insertions, 83 deletions
diff --git a/sys/oss/gstosselement.h b/sys/oss/gstosselement.h index 1b73ec49..3ce84a2c 100644 --- a/sys/oss/gstosselement.h +++ b/sys/oss/gstosselement.h @@ -30,6 +30,7 @@ GST_DEBUG_CATEGORY_EXTERN (oss_debug); #define GST_CAT_DEFAULT oss_debug G_BEGIN_DECLS + #define GST_TYPE_OSSELEMENT \ (gst_osselement_get_type()) #define GST_OSSELEMENT(obj) \ @@ -42,17 +43,16 @@ G_BEGIN_DECLS (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSSELEMENT)) #define GST_OSSELEMENT_GET_CLASS(obj) \ (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_OSSELEMENT, GstOssElementClass)) + typedef struct _GstOssElement GstOssElement; typedef struct _GstOssElementClass GstOssElementClass; -typedef enum -{ +typedef enum { GST_OSSELEMENT_READ, GST_OSSELEMENT_WRITE, } GstOssOpenMode; -typedef struct _GstOssDeviceCombination -{ +typedef struct _GstOssDeviceCombination { gchar *dsp, *mixer; dev_t dev; } GstOssDeviceCombination; @@ -60,57 +60,65 @@ typedef struct _GstOssDeviceCombination struct _GstOssElement { /* yes, we're a gstelement too */ - GstElement parent; + GstElement parent; - gchar *device, *mixer_dev; + gchar *device, + *mixer_dev; /* device state */ - int fd; - int caps; /* the capabilities */ - gint format; - gint fragment; - guint64 fragment_time; - gint fragment_size; + int fd; + int caps; /* the capabilities */ + gint format; + gint fragment; + guint64 fragment_time; + gint fragment_size; GstOssOpenMode mode; /* stats bytes per *second* */ - guint bps; + guint bps; /* parameters */ - gint law; - gint endianness; - gboolean sign; - gint width; - gint depth; - gint channels; - gint rate; + gint law; + gint endianness; + gboolean sign; + gint width; + gint depth; + gint channels; + gint rate; /* mixer stuff */ - GList *tracklist; - guint32 stereomask, recdevs, recmask, mixcaps; - gint mixer_fd; - gchar *device_name; + GList *tracklist; + guint32 stereomask, + recdevs, + recmask, + mixcaps; + gint mixer_fd; + gchar *device_name; }; -struct _GstOssElementClass -{ +struct _GstOssElementClass { GstElementClass klass; - GList *device_combinations; + GList *device_combinations; }; -GType gst_osselement_get_type (void); +GType gst_osselement_get_type (void); /* some useful functions */ -gboolean gst_osselement_parse_caps (GstOssElement * oss, const GstCaps * caps); -gboolean gst_osselement_merge_fixed_caps (GstOssElement * oss, GstCaps * caps); - -gboolean gst_osselement_sync_parms (GstOssElement * oss); -void gst_osselement_reset (GstOssElement * oss); - -gboolean gst_osselement_convert (GstOssElement * oss, - GstFormat src_format, - gint64 src_value, GstFormat * dest_format, gint64 * dest_value); +gboolean gst_osselement_parse_caps (GstOssElement *oss, + const GstCaps *caps); +gboolean gst_osselement_merge_fixed_caps (GstOssElement *oss, + GstCaps *caps); + +gboolean gst_osselement_sync_parms (GstOssElement *oss); +void gst_osselement_reset (GstOssElement *oss); + +gboolean gst_osselement_convert (GstOssElement *oss, + GstFormat src_format, + gint64 src_value, + GstFormat *dest_format, + gint64 *dest_value); G_END_DECLS + #endif /* __GST_OSS_ELEMENT_H__ */ diff --git a/sys/oss/gstossmixer.h b/sys/oss/gstossmixer.h index 100d6afd..dd2fb4fc 100644 --- a/sys/oss/gstossmixer.h +++ b/sys/oss/gstossmixer.h @@ -27,6 +27,7 @@ #include "gstosselement.h" G_BEGIN_DECLS + #define GST_TYPE_OSSMIXER_TRACK \ (gst_ossmixer_track_get_type ()) #define GST_OSSMIXER_TRACK(obj) \ @@ -39,25 +40,25 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_OSSMIXER_TRACK)) #define GST_IS_OSSMIXER_TRACK_CLASS(klass) \ (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_OSSMIXER_TRACK)) - typedef struct _GstOssMixerTrack -{ + +typedef struct _GstOssMixerTrack { GstMixerTrack parent; - gint lvol, rvol; - gint track_num; + gint lvol, rvol; + gint track_num; } GstOssMixerTrack; -typedef struct _GstOssMixerTrackClass -{ +typedef struct _GstOssMixerTrackClass { GstMixerTrackClass parent; } GstOssMixerTrackClass; -GType gst_ossmixer_track_get_type (void); +GType gst_ossmixer_track_get_type (void); -void gst_ossmixer_interface_init (GstMixerClass * klass); -void gst_oss_interface_init (GstImplementsInterfaceClass * klass); -void gst_ossmixer_build_list (GstOssElement * oss); -void gst_ossmixer_free_list (GstOssElement * oss); +void gst_ossmixer_interface_init (GstMixerClass *klass); +void gst_oss_interface_init (GstImplementsInterfaceClass *klass); +void gst_ossmixer_build_list (GstOssElement *oss); +void gst_ossmixer_free_list (GstOssElement *oss); G_END_DECLS + #endif /* __GST_OSS_MIXER_H__ */ diff --git a/sys/oss/gstosssink.h b/sys/oss/gstosssink.h index e633ac52..f484007b 100644 --- a/sys/oss/gstosssink.h +++ b/sys/oss/gstosssink.h @@ -31,6 +31,7 @@ #include <gst/audio/audioclock.h> G_BEGIN_DECLS + #define GST_TYPE_OSSSINK \ (gst_osssink_get_type()) #define GST_OSSSINK(obj) \ @@ -41,42 +42,41 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSSSINK)) #define GST_IS_OSSSINK_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSSSINK)) - typedef enum -{ - GST_OSSSINK_OPEN = GST_ELEMENT_FLAG_LAST, - GST_OSSSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, +typedef enum { + GST_OSSSINK_OPEN = GST_ELEMENT_FLAG_LAST, + + GST_OSSSINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, } GstOssSinkFlags; typedef struct _GstOssSink GstOssSink; typedef struct _GstOssSinkClass GstOssSinkClass; -struct _GstOssSink -{ - GstOssElement element; +struct _GstOssSink { + GstOssElement element; - GstPad *sinkpad; + GstPad *sinkpad; - GstClock *provided_clock; - GstClock *clock; - gboolean resync; - gboolean sync; - guint64 handled; + GstClock *provided_clock; + GstClock *clock; + gboolean resync; + gboolean sync; + guint64 handled; - gboolean mute; - guint bufsize; - guint chunk_size; + gboolean mute; + guint bufsize; + guint chunk_size; }; -struct _GstOssSinkClass -{ +struct _GstOssSinkClass { GstOssElementClass parent_class; /* signals */ - void (*handoff) (GstElement * element, GstPad * pad); + void (*handoff) (GstElement *element,GstPad *pad); }; -GType gst_osssink_get_type (void); +GType gst_osssink_get_type(void); G_END_DECLS + #endif /* __GST_OSSSINK_H__ */ diff --git a/sys/oss/gstosssrc.h b/sys/oss/gstosssrc.h index e74db748..2bc6204f 100644 --- a/sys/oss/gstosssrc.h +++ b/sys/oss/gstosssrc.h @@ -29,6 +29,7 @@ #include "gstosselement.h" G_BEGIN_DECLS + #define GST_TYPE_OSSSRC \ (gst_osssrc_get_type()) #define GST_OSSSRC(obj) \ @@ -39,39 +40,38 @@ G_BEGIN_DECLS (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSSSRC)) #define GST_IS_OSSSRC_CLASS(obj) \ (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSSSRC)) - typedef enum -{ - GST_OSSSRC_OPEN = GST_ELEMENT_FLAG_LAST, - GST_OSSSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, +typedef enum { + GST_OSSSRC_OPEN = GST_ELEMENT_FLAG_LAST, + + GST_OSSSRC_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2, } GstOssSrcFlags; typedef struct _GstOssSrc GstOssSrc; typedef struct _GstOssSrcClass GstOssSrcClass; -struct _GstOssSrc -{ - GstOssElement element; +struct _GstOssSrc { + GstOssElement element; /* pads */ - GstPad *srcpad; - - gboolean need_eos; /* Do we need to emit an EOS? */ + GstPad *srcpad; + gboolean need_eos; /* Do we need to emit an EOS? */ + /* blocking */ - gulong curoffset; - gulong buffersize; + gulong curoffset; + gulong buffersize; /* clocks */ GstClock *provided_clock, *clock; }; -struct _GstOssSrcClass -{ +struct _GstOssSrcClass { GstOssElementClass parent_class; }; -GType gst_osssrc_get_type (void); +GType gst_osssrc_get_type(void); G_END_DECLS + #endif /* __GST_OSSSRC_H__ */ |