summaryrefslogtreecommitdiffstats
path: root/ext/pango
diff options
context:
space:
mode:
authorJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
committerJohan Dahlin <johan@gnome.org>2004-03-15 16:32:54 +0000
commit5acffea623eaa95469a8fb77260c85240c6c0a41 (patch)
tree5d1eb5b3c6cbe7ff7888cfe0b2f972f7e509e99d /ext/pango
parentf878cc16402dcc70f31861bb120f435f3157c518 (diff)
*.h: Revert indenting
Original commit message from CVS: * *.h: Revert indenting
Diffstat (limited to 'ext/pango')
-rw-r--r--ext/pango/gsttextoverlay.h73
-rw-r--r--ext/pango/gsttimeoverlay.h12
2 files changed, 42 insertions, 43 deletions
diff --git a/ext/pango/gsttextoverlay.h b/ext/pango/gsttextoverlay.h
index 08ad8145..b039acac 100644
--- a/ext/pango/gsttextoverlay.h
+++ b/ext/pango/gsttextoverlay.h
@@ -6,6 +6,7 @@
#include <pango/pangoft2.h>
G_BEGIN_DECLS
+
#define GST_TYPE_TEXTOVERLAY (gst_textoverlay_get_type())
#define GST_TEXTOVERLAY(obj) (G_TYPE_CHECK_INSTANCE_CAST((obj),\
GST_TYPE_TEXTOVERLAY, GstTextOverlay))
@@ -17,60 +18,56 @@ G_BEGIN_DECLS
GST_TYPE_TEXTOVERLAY))
#define GST_IS_TEXTOVERLAY_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),\
GST_TYPE_TEXTOVERLAY))
-typedef struct _GstTextOverlay GstTextOverlay;
+
+typedef struct _GstTextOverlay GstTextOverlay;
typedef struct _GstTextOverlayClass GstTextOverlayClass;
typedef enum _GstTextOverlayVAlign GstTextOverlayVAlign;
typedef enum _GstTextOverlayHAlign GstTextOverlayHAlign;
-enum _GstTextOverlayVAlign
-{
- GST_TEXT_OVERLAY_VALIGN_BASELINE,
- GST_TEXT_OVERLAY_VALIGN_BOTTOM,
- GST_TEXT_OVERLAY_VALIGN_TOP,
+enum _GstTextOverlayVAlign {
+ GST_TEXT_OVERLAY_VALIGN_BASELINE,
+ GST_TEXT_OVERLAY_VALIGN_BOTTOM,
+ GST_TEXT_OVERLAY_VALIGN_TOP,
};
-enum _GstTextOverlayHAlign
-{
- GST_TEXT_OVERLAY_HALIGN_LEFT,
- GST_TEXT_OVERLAY_HALIGN_CENTER,
- GST_TEXT_OVERLAY_HALIGN_RIGHT,
+enum _GstTextOverlayHAlign {
+ GST_TEXT_OVERLAY_HALIGN_LEFT,
+ GST_TEXT_OVERLAY_HALIGN_CENTER,
+ GST_TEXT_OVERLAY_HALIGN_RIGHT,
};
-struct _GstTextOverlay
-{
- GstElement element;
+struct _GstTextOverlay {
+ GstElement element;
- GstPad *video_sinkpad;
- GstPad *text_sinkpad;
- GstPad *srcpad;
- gint width;
- gint height;
- PangoLayout *layout;
- FT_Bitmap bitmap;
- gint bitmap_buffer_size;
- gint baseline_y;
- GstTextOverlayVAlign valign;
- GstTextOverlayHAlign halign;
- gint x0;
- gint y0;
- GstBuffer *current_buffer;
- GstBuffer *next_buffer;
- gchar *default_text;
- gboolean need_render;
+ GstPad *video_sinkpad;
+ GstPad *text_sinkpad;
+ GstPad *srcpad;
+ gint width;
+ gint height;
+ PangoLayout *layout;
+ FT_Bitmap bitmap;
+ gint bitmap_buffer_size;
+ gint baseline_y;
+ GstTextOverlayVAlign valign;
+ GstTextOverlayHAlign halign;
+ gint x0;
+ gint y0;
+ GstBuffer *current_buffer;
+ GstBuffer *next_buffer;
+ gchar *default_text;
+ gboolean need_render;
};
-struct _GstTextOverlayClass
-{
- GstElementClass parent_class;
+struct _GstTextOverlayClass {
+ GstElementClass parent_class;
- PangoContext *pango_context;
+ PangoContext *pango_context;
};
-GType
-gst_textoverlay_get_type (void)
- G_GNUC_CONST;
+GType gst_textoverlay_get_type(void) G_GNUC_CONST;
G_END_DECLS
+
#endif /* __GST_TEXTOVERLAY_H */
diff --git a/ext/pango/gsttimeoverlay.h b/ext/pango/gsttimeoverlay.h
index a591bd6a..505f8f04 100644
--- a/ext/pango/gsttimeoverlay.h
+++ b/ext/pango/gsttimeoverlay.h
@@ -29,6 +29,7 @@
G_BEGIN_DECLS
+
#define GST_TYPE_TIMEOVERLAY \
(gst_timeoverlay_get_type())
#define GST_TIMEOVERLAY(obj) \
@@ -39,11 +40,11 @@ G_BEGIN_DECLS
(G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TIMEOVERLAY))
#define GST_IS_TIMEOVERLAY_CLASS(obj) \
(G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TIMEOVERLAY))
+
typedef struct _GstTimeoverlay GstTimeoverlay;
typedef struct _GstTimeoverlayClass GstTimeoverlayClass;
-struct _GstTimeoverlay
-{
+struct _GstTimeoverlay {
GstVideofilter videofilter;
PangoFontDescription *font_description;
@@ -51,12 +52,13 @@ struct _GstTimeoverlay
};
-struct _GstTimeoverlayClass
-{
+struct _GstTimeoverlayClass {
GstVideofilterClass parent_class;
};
-GType gst_timeoverlay_get_type (void);
+GType gst_timeoverlay_get_type(void);
G_END_DECLS
+
#endif /* __GST_TIMEOVERLAY_H__ */
+