Commit 5acffea6 authored by Johan Dahlin's avatar Johan Dahlin

*.h: Revert indenting

Original commit message from CVS:
* *.h: Revert indenting
parent f878cc16
2004-03-15 Johan Dahlin <johan@gnome.org>
* *.h: Revert indenting
2004-03-15 Thomas Vander Stichele <thomas at apestaart dot org> 2004-03-15 Thomas Vander Stichele <thomas at apestaart dot org>
* configure.ac: * configure.ac:
......
...@@ -26,9 +26,8 @@ ...@@ -26,9 +26,8 @@
#include <aalib.h> #include <aalib.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif /* __cplusplus */
#endif /* __cplusplus */
#define GST_TYPE_AASINK \ #define GST_TYPE_AASINK \
...@@ -42,51 +41,48 @@ extern "C" ...@@ -42,51 +41,48 @@ extern "C"
#define GST_IS_AASINK_CLASS(obj) \ #define GST_IS_AASINK_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AASINK)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_AASINK))
typedef enum typedef enum {
{ GST_AASINK_OPEN = GST_ELEMENT_FLAG_LAST,
GST_AASINK_OPEN = GST_ELEMENT_FLAG_LAST,
GST_AASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_AASINK_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2,
} GstAASinkFlags; } GstAASinkFlags;
typedef struct _GstAASink GstAASink; typedef struct _GstAASink GstAASink;
typedef struct _GstAASinkClass GstAASinkClass; typedef struct _GstAASinkClass GstAASinkClass;
struct _GstAASink struct _GstAASink {
{ GstElement element;
GstElement element;
GstPad *sinkpad; GstPad *sinkpad;
gulong format; gulong format;
gint width, height; gint width, height;
gint frames_displayed; gint frames_displayed;
guint64 frame_time; guint64 frame_time;
GstClock *clock; GstClock *clock;
aa_context *context; aa_context *context;
struct aa_hardware_params ascii_surf; struct aa_hardware_params ascii_surf;
struct aa_renderparams ascii_parms; struct aa_renderparams ascii_parms;
aa_palette palette; aa_palette palette;
gint aa_driver; gint aa_driver;
}; };
struct _GstAASinkClass struct _GstAASinkClass {
{ GstElementClass parent_class;
GstElementClass parent_class;
/* signals */ /* signals */
void (*frame_displayed) (GstElement * element); void (*frame_displayed) (GstElement *element);
void (*have_size) (GstElement * element, guint width, guint height); void (*have_size) (GstElement *element, guint width, guint height);
}; };
GType gst_aasink_get_type (void); GType gst_aasink_get_type(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GST_AASINKE_H__ */ #endif /* __GST_AASINKE_H__ */
...@@ -24,9 +24,8 @@ ...@@ -24,9 +24,8 @@
#include <gst/gst.h> #include <gst/gst.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif /* __cplusplus */
#endif /* __cplusplus */
#include <libdv/dv.h> #include <libdv/dv.h>
...@@ -34,55 +33,55 @@ extern "C" ...@@ -34,55 +33,55 @@ extern "C"
/* This is the definition of the element's object structure. */ /* This is the definition of the element's object structure. */
typedef struct _GstDVDec GstDVDec; typedef struct _GstDVDec GstDVDec;
/* The structure itself is derived from GstElement, as can be seen by the /* The structure itself is derived from GstElement, as can be seen by the
* fact that there's a complete instance of the GstElement structure at * fact that there's a complete instance of the GstElement structure at
* the beginning of the object. This allows the element to be cast to * the beginning of the object. This allows the element to be cast to
* an Element or even an Object. * an Element or even an Object.
*/ */
struct _GstDVDec struct _GstDVDec {
{ GstElement element;
GstElement element;
/* We need to keep track of our pads, so we do so here. */
/* We need to keep track of our pads, so we do so here. */ GstPad *sinkpad,
GstPad *sinkpad, *videosrcpad, *audiosrcpad; *videosrcpad,
*audiosrcpad;
dv_decoder_t *decoder;
gboolean clamp_luma; dv_decoder_t *decoder;
gboolean clamp_chroma; gboolean clamp_luma;
gint quality; gboolean clamp_chroma;
gint quality;
GstByteStream *bs;
dv_color_space_t space; GstByteStream *bs;
gint bpp; dv_color_space_t space;
gboolean PAL; gint bpp;
gdouble framerate; gboolean PAL;
gint height; gdouble framerate;
gint frequency; gint height;
gint channels; gint frequency;
gint channels;
gint length;
guint64 next_ts; gint length;
guint64 end_position; guint64 next_ts;
gboolean need_discont; guint64 end_position;
gboolean loop; gboolean need_discont;
gboolean loop;
gboolean found_header;
gboolean found_header;
gint16 *audio_buffers[4];
}; gint16 *audio_buffers[4];
};
/* The other half of the object is its class. The class also derives from /* The other half of the object is its class. The class also derives from
* the same parent, though it must be the class structure this time. * the same parent, though it must be the class structure this time.
* Function pointers for polymophic methods and signals are placed in this * Function pointers for polymophic methods and signals are placed in this
* structure. */ * structure. */
typedef struct _GstDVDecClass GstDVDecClass; typedef struct _GstDVDecClass GstDVDecClass;
struct _GstDVDecClass struct _GstDVDecClass {
{ GstElementClass parent_class;
GstElementClass parent_class; };
};
/* Five standard preprocessing macros are used in the Gtk+ object system. /* Five standard preprocessing macros are used in the Gtk+ object system.
* The first uses the object's _get_type function to return the GType * The first uses the object's _get_type function to return the GType
...@@ -108,12 +107,12 @@ extern "C" ...@@ -108,12 +107,12 @@ extern "C"
/* This is the only prototype needed, because it is used in the above /* This is the only prototype needed, because it is used in the above
* GST_TYPE_DVDEC macro. * GST_TYPE_DVDEC macro.
*/ */
GType gst_dvdec_get_type (void); GType gst_dvdec_get_type(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __GST_DVDEC_H__ */ #endif /* __GST_DVDEC_H__ */
...@@ -26,6 +26,7 @@ ...@@ -26,6 +26,7 @@
#include <gst/gst.h> #include <gst/gst.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_ESDMON \ #define GST_TYPE_ESDMON \
(gst_esdmon_get_type()) (gst_esdmon_get_type())
#define GST_ESDMON(obj) \ #define GST_ESDMON(obj) \
...@@ -36,22 +37,21 @@ G_BEGIN_DECLS ...@@ -36,22 +37,21 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDMON)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDMON))
#define GST_IS_ESDMON_CLASS(obj) \ #define GST_IS_ESDMON_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDMON)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDMON))
typedef enum
{ typedef enum {
GST_ESDMON_OPEN = GST_ELEMENT_FLAG_LAST, GST_ESDMON_OPEN = GST_ELEMENT_FLAG_LAST,
GST_ESDMON_FLAG_LAST = GST_ELEMENT_FLAG_LAST + 2, GST_ESDMON_FLAG_LAST = GST_ELEMENT_FLAG_LAST+2,
} GstEsdSrcFlags; } GstEsdSrcFlags;
typedef struct _GstEsdmon GstEsdmon; typedef struct _GstEsdmon GstEsdmon;
typedef struct _GstEsdmonClass GstEsdmonClass; typedef struct _GstEsdmonClass GstEsdmonClass;
struct _GstEsdmon struct _GstEsdmon {
{
GstElement element; GstElement element;
GstPad *srcpad; GstPad *srcpad;
gchar *host; gchar* host;
int fd; int fd;
...@@ -65,13 +65,14 @@ struct _GstEsdmon ...@@ -65,13 +65,14 @@ struct _GstEsdmon
guint64 bytes_per_read; guint64 bytes_per_read;
}; };
struct _GstEsdmonClass struct _GstEsdmonClass {
{
GstElementClass parent_class; GstElementClass parent_class;
}; };
GType gst_esdmon_get_type (void); GType gst_esdmon_get_type(void);
gboolean gst_esdmon_factory_init (GstPlugin * plugin); gboolean gst_esdmon_factory_init(GstPlugin *plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_ESDMON_H__ */ #endif /* __GST_ESDMON_H__ */
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
#include <gst/audio/audioclock.h> #include <gst/audio/audioclock.h>
G_BEGIN_DECLS G_BEGIN_DECLS
#define GST_TYPE_ESDSINK \ #define GST_TYPE_ESDSINK \
(gst_esdsink_get_type()) (gst_esdsink_get_type())
#define GST_ESDSINK(obj) \ #define GST_ESDSINK(obj) \
...@@ -35,41 +36,41 @@ G_BEGIN_DECLS ...@@ -35,41 +36,41 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDSINK)) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_ESDSINK))
#define GST_IS_ESDSINK_CLASS(obj) \ #define GST_IS_ESDSINK_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDSINK)) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_ESDSINK))
typedef struct _GstEsdsink GstEsdsink; typedef struct _GstEsdsink GstEsdsink;
typedef struct _GstEsdsinkClass GstEsdsinkClass; typedef struct _GstEsdsinkClass GstEsdsinkClass;
struct _GstEsdsink struct _GstEsdsink {
{ GstElement element;
GstElement element;
GstPad *sinkpad; GstPad *sinkpad;
GstClock *provided_clock; GstClock *provided_clock;
GstClock *clock; GstClock *clock;
gboolean mute; gboolean mute;
int fd; int fd;
gint format; gint format;
gint depth; gint depth;
gint channels; gint channels;
gint frequency; gint frequency;
gboolean negotiated; gboolean negotiated;
gchar *host; gchar *host;
int handled; int handled;
int bytes_per_sample; int bytes_per_sample;
gboolean sync; gboolean sync;
gboolean resync; gboolean resync;
gboolean fallback; gboolean fallback;
}; };
struct _GstEsdsinkClass struct _GstEsdsinkClass {
{
GstElementClass parent_class; GstElementClass parent_class;
}; };
GType gst_esdsink_get_type (void); GType gst_esdsink_get_type(void);
gboolean gst_esdsink_factory_init (GstPlugin * plugin); gboolean gst_esdsink_factory_init (GstPlugin *plugin);
G_END_DECLS G_END_DECLS
#endif /* __GST_ESDSINK_H__ */ #endif /* __GST_ESDSINK_H__ */
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
/* FIXME when there's a autoconf symbol */ /* FIXME when there's a autoconf symbol */
#ifndef FLAC_VERSION #ifndef FLAC_VERSION
#ifndef FLAC__VERSION_STRING /* removed in 1.0.4 */ #ifndef FLAC__VERSION_STRING /* removed in 1.0.4 */
#define FLAC_VERSION 0x010004 #define FLAC_VERSION 0x010004
#else #else
#ifdef FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE #ifdef FLAC__REFERENCE_CODEC_MAX_BITS_PER_SAMPLE
......
...@@ -28,9 +28,8 @@ ...@@ -28,9 +28,8 @@
#include <FLAC/all.h> #include <FLAC/all.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif /* __cplusplus */
#endif /* __cplusplus */
#define GST_TYPE_FLACDEC flacdec_get_type() #define GST_TYPE_FLACDEC flacdec_get_type()
...@@ -39,42 +38,40 @@ extern "C" ...@@ -39,42 +38,40 @@ extern "C"
#define GST_IS_FLACDEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACDEC) #define GST_IS_FLACDEC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACDEC)
#define GST_IS_FLACDEC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACDEC) #define GST_IS_FLACDEC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACDEC)
typedef struct _FlacDec FlacDec; typedef struct _FlacDec FlacDec;
typedef struct _FlacDecClass FlacDecClass; typedef struct _FlacDecClass FlacDecClass;
struct _FlacDec struct _FlacDec {
{ GstElement element;
GstElement element;
GstPad *sinkpad, *srcpad; GstPad *sinkpad,*srcpad;
GstByteStream *bs; GstByteStream *bs;
FLAC__SeekableStreamDecoder *decoder; FLAC__SeekableStreamDecoder *decoder;
gint channels; gint channels;
gint depth; gint depth;
gint frequency; gint frequency;
gboolean need_discont; gboolean need_discont;
gboolean seek_pending; gboolean seek_pending;
gint64 seek_value; gint64 seek_value;
gboolean init; gboolean init;
guint64 total_samples; guint64 total_samples;
guint64 stream_samples; guint64 stream_samples;
gboolean eos; gboolean eos;
}; };
struct _FlacDecClass struct _FlacDecClass {
{ GstElementClass parent_class;
GstElementClass parent_class; };
};
GType flacdec_get_type (void); GType flacdec_get_type(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __FLACDEC_H__ */ #endif /* __FLACDEC_H__ */
...@@ -27,9 +27,8 @@ ...@@ -27,9 +27,8 @@
#include <FLAC/all.h> #include <FLAC/all.h>
#ifdef __cplusplus #ifdef __cplusplus
extern "C" extern "C" {
{ #endif /* __cplusplus */
#endif /* __cplusplus */
#define GST_TYPE_FLACENC flacenc_get_type() #define GST_TYPE_FLACENC flacenc_get_type()
#define GST_FLACENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLACENC, FlacEnc) #define GST_FLACENC(obj) G_TYPE_CHECK_INSTANCE_CAST(obj, GST_TYPE_FLACENC, FlacEnc)
...@@ -37,42 +36,40 @@ extern "C" ...@@ -37,42 +36,40 @@ extern "C"
#define GST_IS_FLACENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACENC) #define GST_IS_FLACENC(obj) G_TYPE_CHECK_INSTANCE_TYPE(obj, GST_TYPE_FLACENC)
#define GST_IS_FLACENC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACENC) #define GST_IS_FLACENC_CLASS(obj) G_TYPE_CHECK_CLASS_TYPE(klass, GST_TYPE_FLACENC)
typedef struct _FlacEnc FlacEnc; typedef struct _FlacEnc FlacEnc;
typedef struct _FlacEncClass FlacEncClass; typedef struct _FlacEncClass FlacEncClass;
struct _FlacEnc struct _FlacEnc {
{ GstElement element;
GstElement element;
GstPad *sinkpad, *srcpad; GstPad *sinkpad,*srcpad;
gboolean first; gboolean first;
GstBuffer *first_buf; GstBuffer *first_buf;
gboolean eos; gboolean eos;
gint channels; gint channels;
gint depth; gint depth;
gint sample_rate; gint sample_rate;
gboolean negotiated; gboolean negotiated;
gint quality; gint quality;
gboolean stopped; gboolean stopped;
FLAC__int32 *data; FLAC__int32 *data;
FLAC__SeekableStreamEncoder *encoder; FLAC__SeekableStreamEncoder *encoder;
FLAC__StreamMetadata **meta; FLAC__StreamMetadata **meta;
GstTagList *tags; GstTagList * tags;
}; };
struct _FlacEncClass struct _FlacEncClass {
{ GstElementClass parent_class;
GstElementClass parent_class; };
};
GType flacenc_get_type (void); GType flacenc_get_type(void);
#ifdef __cplusplus #ifdef __cplusplus
} }
#endif /* __cplusplus */ #endif /* __cplusplus */
#endif /* __FLACENC_H__ */ #endif /* __FLACENC_H__ */
...@@ -27,16 +27,20 @@ ...@@ -27,16 +27,20 @@
#include <stdio.h> #include <stdio.h>
G_BEGIN_DECLS G_BEGIN_DECLS
/* how many bytes we need to have available before we dare to start a new iteration */ /* how many bytes we need to have available before we dare to start a new iteration */
#define GST_GDK_BUFFER_SIZE (102400) #define GST_GDK_BUFFER_SIZE (102400)
/* how far behind we need to be before we attempt to seek */ /* how far behind we need to be before we attempt to seek */
#define GST_GDK_MAX_DELAY_TO_SEEK (GST_SECOND / 4) #define GST_GDK_MAX_DELAY_TO_SEEK (GST_SECOND / 4)
#define GST_TYPE_GDK_ANIMATION (gst_gdk_animation_get_type()) #define GST_TYPE_GDK_ANIMATION (gst_gdk_animation_get_type())
#define GST_GDK_ANIMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_ANIMATION,GstGdkAnimation)) #define GST_GDK_ANIMATION(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_GDK_ANIMATION,GstGdkAnimation))
#define GST_GDK_ANIMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_ANIMATION,GstGdkAnimation)) #define GST_GDK_ANIMATION_CLASS(klass) (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_GDK_ANIMATION,GstGdkAnimation))
#define GST_IS_GDK_ANIMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_ANIMATION)) #define GST_IS_GDK_ANIMATION(obj) (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_GDK_ANIMATION))
#define GST_IS_GDK_ANIMATION_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_ANIMATION)) #define GST_IS_GDK_ANIMATION_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_GDK_ANIMATION))
typedef struct _GstGdkAnimation GstGdkAnimation;
typedef struct _GstGdkAnimation GstGdkAnimation;
typedef struct _GstGdkAnimationClass GstGdkAnimationClass; typedef struct _GstGdkAnimationClass GstGdkAnimationClass;
typedef struct _GstGdkAnimationIter GstGdkAnimationIter; typedef struct _GstGdkAnimationIter GstGdkAnimationIter;
...@@ -44,33 +48,34 @@ typedef struct _GstGdkAnimationIterClass GstGdkAnimationIterClass; ...@@ -44,33 +48,34 @@ typedef struct _GstGdkAnimationIterClass GstGdkAnimationIterClass;
struct _GstGdkAnimation struct _GstGdkAnimation
{ {
GdkPixbufAnimation parent; GdkPixbufAnimation parent;
/* name of temporary buffer file */ /* name of temporary buffer file */
gchar *temp_location; gchar * temp_location;
/* file descriptor to temporary file or 0 if we're done writing */ /* file descriptor to temporary file or 0 if we're done writing */
int temp_fd; int temp_fd;
/* size of image */ /* size of image */
gint width; gint width;
gint height; gint height;
gint bpp; gint bpp;
/* static image we use */ /* static image we use */
GdkPixbuf *pixbuf; GdkPixbuf * pixbuf;
}; };
struct _GstGdkAnimationClass struct _GstGdkAnimationClass
{ {
GdkPixbufAnimationClass parent_class; GdkPixbufAnimationClass parent_class;
}; };
GType gst_gdk_animation_get_type (void); GType gst_gdk_animation_get_type (void);
GstGdkAnimation *gst_gdk_animation_new (GError ** error); GstGdkAnimation * gst_gdk_animation_new (GError **error);
gboolean gst_gdk_animation_add_data (GstGdkAnimation * ani, gboolean gst_gdk_animation_add_data (GstGdkAnimation * ani,
const guint8 * data, guint size); const guint8 * data,
void gst_gdk_animation_done_adding (GstGdkAnimation * ani); guint size);
void gst_gdk_animation_done_adding (GstGdkAnimation * ani);
#define GST_TYPE_GDK_ANIMATION_ITER (gst_gdk_animation_iter_get_type ()) #define GST_TYPE_GDK_ANIMATION_ITER (gst_gdk_animation_iter_get_type ())
...@@ -81,35 +86,32 @@ void gst_gdk_animation_done_adding (GstGdkAnimation * ani); ...@@ -81,35 +86,32 @@ void gst_gdk_animation_done_adding (GstGdkAnimation * ani);
#define GST_IS_GDK_ANIMATION_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GDK_ANIMATION_ITER)) #define GST_IS_GDK_ANIMATION_ITER_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_GDK_ANIMATION_ITER))
#define GST_GDK_ANIMATION_ITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_GDK_ANIMATION_ITER, GstGdkAnimationIterClass)) #define GST_GDK_ANIMATION_ITER_GET_CLASS(obj) (G_TYPE_INSTANCE_GET_CLASS ((obj), GST_TYPE_GDK_ANIMATION_ITER, GstGdkAnimationIterClass))
struct _GstGdkAnimationIter struct _GstGdkAnimationIter {
{ GdkPixbufAnimationIter parent;
GdkPixbufAnimationIter parent;
/* our animation */ /* our animation */
GstGdkAnimation *ani; GstGdkAnimation * ani;
/* start timeval */ /* start timeval */
GTimeVal start; GTimeVal start;
/* timestamp of last buffer */ /* timestamp of last buffer */
GstClockTime last_timestamp; GstClockTime </