1 files changed, 24 insertions, 32 deletions
diff --git a/ext/pango/gsttimeoverlay.h b/ext/pango/gsttimeoverlay.h
index 505f8f04..7fe90477 100644
--- a/ext/pango/gsttimeoverlay.h
+++ b/ext/pango/gsttimeoverlay.h
@@ -1,5 +1,6 @@
 /* GStreamer
  * Copyright (C) <1999> Erik Walthinsen <omega@cse.ogi.edu>
+ * Copyright (C) <2005> Tim-Philipp Müller <tim@centricular.net>
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Library General Public
@@ -18,47 +19,38 @@
  */
 
 
-#ifndef __GST_TIMEOVERLAY_H__
-#define __GST_TIMEOVERLAY_H__
-
-
-#include <gst/gst.h>
-#include <pango/pango.h>
-
-#include "gstvideofilter.h"
+#ifndef __GST_TIME_OVERLAY_H__
+#define __GST_TIME_OVERLAY_H__
 
+#include "gsttextoverlay.h"
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_TIMEOVERLAY \
-  (gst_timeoverlay_get_type())
-#define GST_TIMEOVERLAY(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TIMEOVERLAY,GstTimeoverlay))
-#define GST_TIMEOVERLAY_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TIMEOVERLAY,GstTimeoverlayClass))
-#define GST_IS_TIMEOVERLAY(obj) \
-  (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 {
-  GstVideofilter videofilter;
-
-  PangoFontDescription *font_description;
-  PangoContext *context;
-
+#define GST_TYPE_TIME_OVERLAY \
+  (gst_time_overlay_get_type())
+#define GST_TIME_OVERLAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_TIME_OVERLAY,GstTimeOverlay))
+#define GST_TIME_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_TIME_OVERLAY,GstTimeOverlayClass))
+#define GST_IS_TIME_OVERLAY(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_TIME_OVERLAY))
+#define GST_IS_TIME_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_TIME_OVERLAY))
+
+typedef struct _GstTimeOverlay GstTimeOverlay;
+typedef struct _GstTimeOverlayClass GstTimeOverlayClass;
+
+struct _GstTimeOverlay {
+  GstTextOverlay textoverlay;
 };
 
-struct _GstTimeoverlayClass {
-  GstVideofilterClass parent_class;
+struct _GstTimeOverlayClass {
+  GstTextOverlayClass parent_class;
 };
 
-GType gst_timeoverlay_get_type(void);
+GType gst_time_overlay_get_type (void);
 
 G_END_DECLS
 
-#endif /* __GST_TIMEOVERLAY_H__ */
+#endif /* __GST_TIME_OVERLAY_H__ */