Some interface implementations for video4linux/video4linux2 plugins: a Tuner interface, with which one can select inp...

Original commit message from CVS:
Some interface implementations for video4linux/video4linux2 plugins:
* a Tuner interface, with which one can select inputs and stations. Audio
work is underway here, but unfinished.
* A Xoverlay interface with which one can do simple overlay. Similar to
the API of the v4l/Xv XFree86 extension. Widget implementation for
GTK-2.0 coming up in the sandbox.
* Colorbalance - for adapting colors (brightness, contrast, etc.) - pretty
basic and maybe somewhat overdesigned. But it'll do for now.

Apart from these interfaces, there's also a loadable library 'xwindowlistener'
that listenes to X for the movement of a window and the overlap of other
windows. This is partly copied from xawtv (and thus partly GPL :(), but it's
needed for the xoverlay interface implementation in the v4l/v4l2 elements.

Lastly, some small changes to remove redundant properties from the v4l/v4l2
elements since these can be done much simpler. Comments appreciated!

19 files changed, 1946 insertions, 6 deletions

diff --git a/gst-libs/gst/Makefile.am b/gst-libs/gst/Makefile.am
index 04acada7..06f12a07 100644
--- a/gst-libs/gst/Makefile.am
+++ b/gst-libs/gst/Makefile.am
@@ -4,10 +4,20 @@ else
 GCONF_DIR=
 endif
 
-SUBDIRS = audio idct resample riff floatcast \
-		$(GCONF_DIR) media-info mixer \
-		navigation play video
+if USE_XFREE
+X_DIR=xwindowlistener
+else
+X_DIR=
+endif
+
+SUBDIRS = audio colorbalance floatcast \
+		$(GCONF_DIR) idct media-info \
+		mixer navigation play \
+		resample riff tuner video \
+		xoverlay $(X_DIR)
 
-DIST_SUBDIRS = audio idct resample riff floatcast \
-		gconf media-info mixer navigation \
-		play video
+DIST_SUBDIRS = audio colorbalance floatcast \
+		gconf idct media-info \
+		mixer navigation play \
+		resample riff tuner video \
+		xoverlay xwindowlistener
diff --git a/gst-libs/gst/colorbalance/Makefile.am b/gst-libs/gst/colorbalance/Makefile.am
new file mode 100644
index 00000000..cbd94c91
--- /dev/null
+++ b/gst-libs/gst/colorbalance/Makefile.am
@@ -0,0 +1,15 @@
+libgstinterfacesincludedir = \
+	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/colorbalance
+
+libgstinterfacesinclude_HEADERS = \
+	colorbalance.h \
+	colorbalancechannel.h
+
+lib_LTLIBRARIES = libgstcolorbalance.la
+
+libgstcolorbalance_la_SOURCES = \
+	colorbalance.c \
+	colorbalancechannel.c
+libgstcolorbalance_la_LIBADD = 
+libgstcolorbalance_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
+libgstcolorbalance_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/colorbalance/colorbalance.c b/gst-libs/gst/colorbalance/colorbalance.c
new file mode 100644
index 00000000..829cf5f6
--- /dev/null
+++ b/gst-libs/gst/colorbalance/colorbalance.c
@@ -0,0 +1,103 @@
+/* GStreamer Color Balance
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * colorbalance.c: image color balance interface design
+ *		   virtual class function wrappers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "colorbalance.h"
+
+static void 	gst_color_balance_class_init	(GstColorBalanceClass *klass);
+
+GType
+gst_color_balance_get_type (void)
+{
+  static GType gst_color_balance_type = 0;
+
+  if (!gst_color_balance_type) {
+    static const GTypeInfo gst_color_balance_info = {
+      sizeof (GstColorBalanceClass),
+      (GBaseInitFunc) gst_color_balance_class_init,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      0,
+      0,
+      NULL,
+    };
+
+    gst_color_balance_type = g_type_register_static (G_TYPE_INTERFACE,
+						     "GstColorBalance",
+						     &gst_color_balance_info, 0);
+    g_type_interface_add_prerequisite (gst_color_balance_type,
+				       GST_TYPE_INTERFACE);
+  }
+
+  return gst_color_balance_type;
+}
+
+static void
+gst_color_balance_class_init (GstColorBalanceClass *klass)
+{
+  /* default virtual functions */
+  klass->list_channels = NULL;
+  klass->set_value = NULL;
+  klass->get_value = NULL;
+}
+
+const GList *
+gst_color_balance_list_channels	(GstColorBalance *balance)
+{
+  GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance);
+
+  if (klass->list_channels) {
+    return klass->list_channels (balance);
+  }
+
+  return NULL;
+}
+
+void
+gst_color_balance_set_value (GstColorBalance        *balance,
+			     GstColorBalanceChannel *channel,
+			     gint                    value)
+{
+  GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance);
+
+  if (klass->set_value) {
+    klass->set_value (balance, channel, value);
+  }
+}
+
+gint
+gst_color_balance_get_value (GstColorBalance        *balance,
+			     GstColorBalanceChannel *channel)
+{
+  GstColorBalanceClass *klass = GST_COLOR_BALANCE_GET_CLASS (balance);
+
+  if (klass->get_value) {
+    return klass->get_value (balance, channel);
+  }
+
+  return channel->min_value;
+}
diff --git a/gst-libs/gst/colorbalance/colorbalance.h b/gst-libs/gst/colorbalance/colorbalance.h
new file mode 100644
index 00000000..2b9d27d3
--- /dev/null
+++ b/gst-libs/gst/colorbalance/colorbalance.h
@@ -0,0 +1,73 @@
+/* GStreamer Color Balance
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * color-balance.h: image color balance interface design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_COLOR_BALANCE_H__
+#define __GST_COLOR_BALANCE_H__
+
+#include <gst/gst.h>
+#include <gst/colorbalance/colorbalancechannel.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_COLOR_BALANCE \
+  (gst_color_balance_get_type ())
+#define GST_COLOR_BALANCE(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE, \
+				      GstColorBalance))
+#define GST_COLOR_BALANCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE, \
+			    GstColorBalanceClass))
+#define GST_IS_COLOR_BALANCE(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE))
+#define GST_IS_COLOR_BALANCE_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE))
+#define GST_COLOR_BALANCE_GET_CLASS(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_COLOR_BALANCE, GstColorBalanceClass))
+
+typedef struct _GstColorBalance GstColorBalance;
+
+typedef struct _GstColorBalanceClass {
+  GTypeInterface klass;
+
+  /* virtual functions */
+  const GList * (* list_channels) (GstColorBalance        *balance);
+
+  void          (* set_value)     (GstColorBalance        *balance,
+				   GstColorBalanceChannel *channel,
+				   gint                    value);
+  gint          (* get_value)     (GstColorBalance        *balance,
+				   GstColorBalanceChannel *channel);
+} GstColorBalanceClass;
+
+GType	gst_color_balance_get_type	(void);
+
+/* virtual class function wrappers */
+const GList *
+	gst_color_balance_list_channels	(GstColorBalance        *balance);
+void	gst_color_balance_set_value	(GstColorBalance        *balance,
+					 GstColorBalanceChannel *channel,
+					 gint                    value);
+gint	gst_color_balance_get_value	(GstColorBalance        *balance,
+					 GstColorBalanceChannel *channel);
+
+G_END_DECLS
+
+#endif /* __GST_COLOR_BALANCE_H__ */
diff --git a/gst-libs/gst/colorbalance/colorbalancechannel.c b/gst-libs/gst/colorbalance/colorbalancechannel.c
new file mode 100644
index 00000000..8241bfe7
--- /dev/null
+++ b/gst-libs/gst/colorbalance/colorbalancechannel.c
@@ -0,0 +1,104 @@
+/* GStreamer Color Balance
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * colorbalancechannel.c: colorbalance channel object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "colorbalancechannel.h"
+
+enum {
+  /* FILL ME */
+  SIGNAL_VALUE_CHANGED,
+  LAST_SIGNAL
+};
+
+static void gst_color_balance_channel_class_init (GstColorBalanceChannelClass *klass);
+static void gst_color_balance_channel_init (GstColorBalanceChannel *balance);
+static void gst_color_balance_channel_dispose (GObject *object);
+
+static GObjectClass *parent_class = NULL;
+static guint signals[LAST_SIGNAL] = { 0 };
+
+GType
+gst_color_balance_channel_get_type (void)
+{
+  static GType gst_color_balance_channel_type = 0;
+
+  if (!gst_color_balance_channel_type) {
+    static const GTypeInfo color_balance_channel_info = {
+      sizeof (GstColorBalanceChannelClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_color_balance_channel_class_init,
+      NULL,
+      NULL,
+      sizeof (GstColorBalanceChannel),
+      0,
+      (GInstanceInitFunc) gst_color_balance_channel_init,
+      NULL
+    };
+
+    gst_color_balance_channel_type =
+	g_type_register_static (G_TYPE_OBJECT,
+				"GstColorBalanceChannel",
+				&color_balance_channel_info, 0);
+  }
+
+  return gst_color_balance_channel_type;
+}
+
+static void
+gst_color_balance_channel_class_init (GstColorBalanceChannelClass *klass)
+{
+  GObjectClass *object_klass = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  signals[SIGNAL_VALUE_CHANGED] =
+    g_signal_new ("value_changed", G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GstColorBalanceChannelClass,
+				   value_changed),
+                  NULL, NULL, g_cclosure_marshal_VOID__INT,
+                  G_TYPE_NONE, 1, G_TYPE_INT);
+
+  object_klass->dispose = gst_color_balance_channel_dispose;
+}
+
+static void
+gst_color_balance_channel_init (GstColorBalanceChannel *channel)
+{
+  channel->label = NULL;
+  channel->min_value = channel->max_value = 0;
+}
+
+static void
+gst_color_balance_channel_dispose (GObject *object)
+{
+  GstColorBalanceChannel *channel = GST_COLOR_BALANCE_CHANNEL (object);
+
+  if (channel->label)
+    g_free (channel->label);
+
+  if (parent_class->dispose)
+    parent_class->dispose (object);
+}
diff --git a/gst-libs/gst/colorbalance/colorbalancechannel.h b/gst-libs/gst/colorbalance/colorbalancechannel.h
new file mode 100644
index 00000000..5f738ecb
--- /dev/null
+++ b/gst-libs/gst/colorbalance/colorbalancechannel.h
@@ -0,0 +1,62 @@
+/* GStreamer Color Balance
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * colorbalancechannel.h: individual channel object
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_COLOR_BALANCE_CHANNEL_H__
+#define __GST_COLOR_BALANCE_CHANNEL_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_COLOR_BALANCE_CHANNEL \
+  (gst_color_balance_channel_get_type ())
+#define GST_COLOR_BALANCE_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL, \
+			       GstColorBalanceChannel))
+#define GST_COLOR_BALANCE_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL, \
+			    GstColorBalanceChannelClass))
+#define GST_IS_COLOR_BALANCE_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_COLOR_BALANCE_CHANNEL))
+#define GST_IS_COLOR_BALANCE_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_COLOR_BALANCE_CHANNEL))
+
+typedef struct _GstColorBalanceChannel {
+  GObject parent;
+
+  gchar  *label;
+  gint    min_value,
+	  max_value;
+} GstColorBalanceChannel;
+
+typedef struct _GstColorBalanceChannelClass {
+  GObjectClass parent;
+
+  /* signals */
+  void (* value_changed) (GstColorBalanceChannel *channel,
+			  gint                    value);
+} GstColorBalanceChannelClass;
+
+GType	gst_color_balance_channel_get_type (void);
+
+G_END_DECLS
+
+#endif /* __GST_COLOR_BALANCE_CHANNEL_H__ */
diff --git a/gst-libs/gst/tuner/Makefile.am b/gst-libs/gst/tuner/Makefile.am
new file mode 100644
index 00000000..e349eb32
--- /dev/null
+++ b/gst-libs/gst/tuner/Makefile.am
@@ -0,0 +1,17 @@
+libgstinterfacesincludedir = \
+	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/tuner
+
+libgstinterfacesinclude_HEADERS = \
+		tuner.h \
+		tunernorm.h \
+		tunerchannel.h
+
+lib_LTLIBRARIES = libgsttuner.la
+
+libgsttuner_la_SOURCES = \
+	tuner.c \
+	tunernorm.c \
+	tunerchannel.c
+libgsttuner_la_LIBADD = 
+libgsttuner_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
+libgsttuner_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/tuner/tuner.c b/gst-libs/gst/tuner/tuner.c
new file mode 100644
index 00000000..43dda8d0
--- /dev/null
+++ b/gst-libs/gst/tuner/tuner.c
@@ -0,0 +1,190 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tuner.c: tuner design virtual class function wrappers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tuner.h"
+
+static void 	gst_tuner_class_init	(GstTunerClass *klass);
+
+GType
+gst_tuner_get_type (void)
+{
+  static GType gst_tuner_type = 0;
+
+  if (!gst_tuner_type) {
+    static const GTypeInfo gst_tuner_info = {
+      sizeof (GstTunerClass),
+      (GBaseInitFunc) gst_tuner_class_init,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      0,
+      0,
+      NULL,
+    };
+
+    gst_tuner_type = g_type_register_static (G_TYPE_INTERFACE,
+					     "GstTuner",
+					     &gst_tuner_info, 0);
+    g_type_interface_add_prerequisite (gst_tuner_type,
+				       GST_TYPE_INTERFACE);
+  }
+
+  return gst_tuner_type;
+}
+
+static void
+gst_tuner_class_init (GstTunerClass *klass)
+{
+  /* default virtual functions */
+  klass->list_channels = NULL;
+  klass->set_channel = NULL;
+  klass->get_channel = NULL;
+
+  klass->list_norms = NULL;
+  klass->set_norm = NULL;
+  klass->get_norm = NULL;
+
+  klass->set_frequency = NULL;
+  klass->get_frequency = NULL;
+  klass->signal_strength = NULL;
+}
+
+const GList *
+gst_tuner_list_channels (GstTuner *tuner)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->list_channels) {
+    return klass->list_channels (tuner);
+  }
+
+  return NULL;
+}
+
+void
+gst_tuner_set_channel (GstTuner        *tuner,
+		       GstTunerChannel *channel)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->set_channel) {
+    klass->set_channel (tuner, channel);
+  }
+}
+
+const GstTunerChannel *
+gst_tuner_get_channel (GstTuner *tuner)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->get_channel) {
+    return klass->get_channel (tuner);
+  }
+
+  return NULL;
+}
+
+const GList *
+gst_tuner_list_norms (GstTuner *tuner)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->list_norms) {
+    return klass->list_norms (tuner);
+  }
+
+  return NULL;
+}
+
+void
+gst_tuner_set_norm (GstTuner     *tuner,
+		    GstTunerNorm *norm)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->set_norm) {
+    klass->set_norm (tuner, norm);
+  }
+}
+
+const GstTunerNorm *
+gst_tuner_get_norm (GstTuner *tuner)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  if (klass->get_norm) {
+    return klass->get_norm (tuner);
+  }
+
+  return NULL;
+}
+
+void
+gst_tuner_set_frequency (GstTuner        *tuner,
+			 GstTunerChannel *channel,
+			 gulong           frequency)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  g_return_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+					GST_TUNER_CHANNEL_FREQUENCY));
+
+  if (klass->set_frequency) {
+    klass->set_frequency (tuner, channel, frequency);
+  }
+}
+
+gulong
+gst_tuner_get_frequency (GstTuner        *tuner,
+			 GstTunerChannel *channel)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+					GST_TUNER_CHANNEL_FREQUENCY), 0);
+
+  if (klass->get_frequency) {
+    return klass->get_frequency (tuner, channel);
+  }
+
+  return 0;
+}
+
+gint
+gst_tuner_signal_strength (GstTuner        *tuner,
+			   GstTunerChannel *channel)
+{
+  GstTunerClass *klass = GST_TUNER_GET_CLASS (tuner);
+
+  g_return_val_if_fail (GST_TUNER_CHANNEL_HAS_FLAG (channel,
+					GST_TUNER_CHANNEL_FREQUENCY), 0);
+
+  if (klass->signal_strength) {
+    return klass->signal_strength (tuner, channel);
+  }
+
+  return 0;
+}
diff --git a/gst-libs/gst/tuner/tuner.h b/gst-libs/gst/tuner/tuner.h
new file mode 100644
index 00000000..1cd51e11
--- /dev/null
+++ b/gst-libs/gst/tuner/tuner.h
@@ -0,0 +1,96 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tuner.h: tuner interface design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_H__
+#define __GST_TUNER_H__
+
+#include <gst/gst.h>
+#include <gst/tuner/tunernorm.h>
+#include <gst/tuner/tunerchannel.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER \
+  (gst_tuner_get_type ())
+#define GST_TUNER(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER, GstTuner))
+#define GST_TUNER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER, GstTunerClass))
+#define GST_IS_TUNER(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER))
+#define GST_IS_TUNER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER))
+#define GST_TUNER_GET_CLASS(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_TUNER, GstTunerClass))
+
+typedef struct _GstTuner GstTuner;
+
+typedef struct _GstTunerClass {
+  GTypeInterface klass;
+
+  /* virtual functions */
+  const GList * (* list_channels)   (GstTuner        *tuner);
+  void          (* set_channel)     (GstTuner        *tuner,
+				     GstTunerChannel *channel);
+  const GstTunerChannel *
+		(* get_channel)     (GstTuner        *tuner);
+
+  const GList * (* list_norms)      (GstTuner        *tuner);
+  void          (* set_norm)        (GstTuner        *tuner,
+				     GstTunerNorm    *norm);
+  const GstTunerNorm *
+		(* get_norm)        (GstTuner        *tuner);
+
+  void          (* set_frequency)   (GstTuner        *tuner,
+				     GstTunerChannel *channel,
+				     gulong           frequency);
+  gulong        (* get_frequency)   (GstTuner        *tuner,
+				     GstTunerChannel *channel);
+  gint		(* signal_strength) (GstTuner        *tuner,
+				     GstTunerChannel *channel);
+} GstTunerClass;
+
+GType		gst_tuner_get_type		(void);
+
+/* virtual class function wrappers */
+const GList *	gst_tuner_list_channels		(GstTuner        *tuner);
+void		gst_tuner_set_channel		(GstTuner        *tuner,
+						 GstTunerChannel *channel);
+const GstTunerChannel *
+		gst_tuner_get_channel		(GstTuner        *tuner);
+
+const GList *	gst_tuner_list_norms		(GstTuner        *tuner);
+void		gst_tuner_set_norm		(GstTuner        *tuner,
+						 GstTunerNorm    *channel);
+const GstTunerNorm *
+		gst_tuner_get_norm		(GstTuner        *tuner);
+
+void		gst_tuner_set_frequency		(GstTuner        *tuner,
+						 GstTunerChannel *channel,
+						 gulong           frequency);
+gulong		gst_tuner_get_frequency		(GstTuner        *tuner,
+						 GstTunerChannel *channel);
+gint		gst_tuner_signal_strength	(GstTuner        *tuner,
+						 GstTunerChannel *channel);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_H__ */
diff --git a/gst-libs/gst/tuner/tunerchannel.c b/gst-libs/gst/tuner/tunerchannel.c
new file mode 100644
index 00000000..aa98978e
--- /dev/null
+++ b/gst-libs/gst/tuner/tunerchannel.c
@@ -0,0 +1,114 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunerchannel.c: tuner channel object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tunerchannel.h"
+
+enum {
+  /* FILL ME */
+  SIGNAL_FREQUENCY_CHANGED,
+  SIGNAL_SIGNAL_CHANGED,
+  LAST_SIGNAL
+};
+
+static void gst_tuner_channel_class_init (GstTunerChannelClass *klass);
+static void gst_tuner_channel_init 	 (GstTunerChannel *channel);
+static void gst_tuner_channel_dispose    (GObject         *object);
+
+static GObjectClass *parent_class = NULL;
+static guint signals[LAST_SIGNAL] = { 0 };
+
+GType
+gst_tuner_channel_get_type (void)
+{
+  static GType gst_tuner_channel_type = 0;
+
+  if (!gst_tuner_channel_type) {
+    static const GTypeInfo tuner_channel_info = {
+      sizeof (GstTunerChannelClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_tuner_channel_class_init,
+      NULL,
+      NULL,
+      sizeof (GstTunerChannel),
+      0,
+      (GInstanceInitFunc) gst_tuner_channel_init,
+      NULL
+    };
+
+    gst_tuner_channel_type =
+	g_type_register_static (G_TYPE_OBJECT,
+				"GstTunerChannel",
+				&tuner_channel_info, 0);
+  }
+
+  return gst_tuner_channel_type;
+}
+
+static void
+gst_tuner_channel_class_init (GstTunerChannelClass *klass)
+{
+  GObjectClass *object_klass = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  signals[SIGNAL_FREQUENCY_CHANGED] =
+    g_signal_new ("frequency_changed", G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GstTunerChannelClass,
+				   frequency_changed),
+                  NULL, NULL, g_cclosure_marshal_VOID__ULONG,
+                  G_TYPE_NONE, 1, G_TYPE_ULONG);
+  signals[SIGNAL_SIGNAL_CHANGED] =
+    g_signal_new ("signal_changed", G_TYPE_FROM_CLASS (klass),
+		  G_SIGNAL_RUN_LAST,
+                  G_STRUCT_OFFSET (GstTunerChannelClass,
+				   signal_changed),
+                  NULL, NULL, g_cclosure_marshal_VOID__INT,
+                  G_TYPE_NONE, 1, G_TYPE_INT);
+
+  object_klass->dispose = gst_tuner_channel_dispose;
+}
+
+static void
+gst_tuner_channel_init (GstTunerChannel *channel)
+{
+  channel->label = NULL;
+  channel->flags = 0;
+  channel->min_frequency = channel->max_frequency = 0;
+  channel->min_signal = channel->max_signal = 0;
+}
+
+static void
+gst_tuner_channel_dispose (GObject *object)
+{
+  GstTunerChannel *channel = GST_TUNER_CHANNEL (object);
+
+  if (channel->label)
+    g_free (channel->label);
+
+  if (parent_class->dispose)
+    parent_class->dispose (object);
+}
diff --git a/gst-libs/gst/tuner/tunerchannel.h b/gst-libs/gst/tuner/tunerchannel.h
new file mode 100644
index 00000000..b8031455
--- /dev/null
+++ b/gst-libs/gst/tuner/tunerchannel.h
@@ -0,0 +1,77 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunerchannel.h: tuner channel object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_CHANNEL_H__
+#define __GST_TUNER_CHANNEL_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER_CHANNEL \
+  (gst_tuner_channel_get_type ())
+#define GST_TUNER_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER_CHANNEL, \
+			       GstTunerChannel))
+#define GST_TUNER_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER_CHANNEL, \
+			    GstTunerChannelClass))
+#define GST_IS_TUNER_CHANNEL(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER_CHANNEL))
+#define GST_IS_TUNER_CHANNEL_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER_CHANNEL))
+
+typedef enum {
+  GST_TUNER_CHANNEL_INPUT     = (1<<0),
+  GST_TUNER_CHANNEL_OUTPUT    = (1<<1),
+  GST_TUNER_CHANNEL_FREQUENCY = (1<<2),
+  GST_TUNER_CHANNEL_AUDIO     = (1<<3),
+} GstTunerChannelFlags;
+
+#define GST_TUNER_CHANNEL_HAS_FLAG(channel, flag) \
+  ((channel)->flags & flag)
+
+typedef struct _GstTunerChannel {
+  GObject              parent;
+
+  gchar               *label;
+  GstTunerChannelFlags flags;
+  gulong               min_frequency,
+		       max_frequency;
+  gint                 min_signal,
+		       max_signal;
+} GstTunerChannel;
+
+typedef struct _GstTunerChannelClass {
+  GObjectClass parent;
+
+  /* signals */
+  void (*frequency_changed) (GstTunerChannel *tuner,
+			     gulong           frequency);
+  void (*signal_changed)    (GstTunerChannel *tuner,
+			     gint             signal);
+} GstTunerChannelClass;
+
+GType		gst_tuner_channel_get_type	(void);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_CHANNEL_H__ */
diff --git a/gst-libs/gst/tuner/tunernorm.c b/gst-libs/gst/tuner/tunernorm.c
new file mode 100644
index 00000000..48d75de2
--- /dev/null
+++ b/gst-libs/gst/tuner/tunernorm.c
@@ -0,0 +1,95 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunernorm.c: tuner norm object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "tunernorm.h"
+
+enum {
+  /* FILL ME */
+  LAST_SIGNAL
+};
+
+static void gst_tuner_norm_class_init (GstTunerNormClass *klass);
+static void gst_tuner_norm_init       (GstTunerNorm *norm);
+static void gst_tuner_norm_dispose    (GObject      *object);
+
+static GObjectClass *parent_class = NULL;
+/*static guint signals[LAST_SIGNAL] = { 0 };*/
+
+GType
+gst_tuner_norm_get_type (void)
+{
+  static GType gst_tuner_norm_type = 0;
+
+  if (!gst_tuner_norm_type) {
+    static const GTypeInfo tuner_norm_info = {
+      sizeof (GstTunerNormClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_tuner_norm_class_init,
+      NULL,
+      NULL,
+      sizeof (GstTunerNorm),
+      0,
+      (GInstanceInitFunc) gst_tuner_norm_init,
+      NULL
+    };
+
+    gst_tuner_norm_type =
+	g_type_register_static (G_TYPE_OBJECT,
+				"GstTunerNorm",
+				&tuner_norm_info, 0);
+  }
+
+  return gst_tuner_norm_type;
+}
+
+static void
+gst_tuner_norm_class_init (GstTunerNormClass *klass)
+{
+  GObjectClass *object_klass = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  object_klass->dispose = gst_tuner_norm_dispose;
+}
+
+static void
+gst_tuner_norm_init (GstTunerNorm *norm)
+{
+  norm->label = NULL;
+  norm->fps = 0.;
+}
+
+static void
+gst_tuner_norm_dispose (GObject *object)
+{
+  GstTunerNorm *norm = GST_TUNER_NORM (object);
+
+  if (norm->label)
+    g_free (norm->label);
+
+  if (parent_class->dispose)
+    parent_class->dispose (object);
+}
diff --git a/gst-libs/gst/tuner/tunernorm.h b/gst-libs/gst/tuner/tunernorm.h
new file mode 100644
index 00000000..3e6e801d
--- /dev/null
+++ b/gst-libs/gst/tuner/tunernorm.h
@@ -0,0 +1,55 @@
+/* GStreamer Tuner
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tunernorm.h: tuner norm object design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_TUNER_NORM_H__
+#define __GST_TUNER_NORM_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_TUNER_NORM \
+  (gst_tuner_norm_get_type ())
+#define GST_TUNER_NORM(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_TUNER_NORM, GstTunerNorm))
+#define GST_TUNER_NORM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_TUNER_NORM, GstTunerNormClass))
+#define GST_IS_TUNER_NORM(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_TUNER_NORM))
+#define GST_IS_TUNER_NORM_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_TUNER_NORM))
+
+typedef struct _GstTunerNorm {
+  GObject parent;
+
+  gchar  *label;
+  gfloat  fps;
+} GstTunerNorm;
+
+typedef struct _GstTunerNormClass {
+  GObjectClass parent;
+} GstTunerNormClass;
+
+GType		gst_tuner_norm_get_type		(void);
+
+G_END_DECLS
+
+#endif /* __GST_TUNER_NORM_H__ */
diff --git a/gst-libs/gst/xoverlay/Makefile.am b/gst-libs/gst/xoverlay/Makefile.am
new file mode 100644
index 00000000..184d505f
--- /dev/null
+++ b/gst-libs/gst/xoverlay/Makefile.am
@@ -0,0 +1,11 @@
+libgstinterfacesincludedir = \
+	$(includedir)/gstreamer-@GST_MAJORMINOR@/gst/xoverlay
+
+libgstinterfacesinclude_HEADERS = xoverlay.h
+
+lib_LTLIBRARIES = libgstxoverlay.la
+
+libgstxoverlay_la_SOURCES = xoverlay.c
+libgstxoverlay_la_LIBADD = 
+libgstxoverlay_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS)
+libgstxoverlay_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
diff --git a/gst-libs/gst/xoverlay/xoverlay.c b/gst-libs/gst/xoverlay/xoverlay.c
new file mode 100644
index 00000000..f0b4ebb5
--- /dev/null
+++ b/gst-libs/gst/xoverlay/xoverlay.c
@@ -0,0 +1,74 @@
+/* GStreamer X-based Overlay
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * tv-mixer.c: tv-mixer design virtual class function wrappers
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "xoverlay.h"
+
+static void 	gst_x_overlay_class_init	(GstXOverlayClass *klass);
+
+GType
+gst_x_overlay_get_type (void)
+{
+  static GType gst_x_overlay_type = 0;
+
+  if (!gst_x_overlay_type) {
+    static const GTypeInfo gst_x_overlay_info = {
+      sizeof (GstXOverlayClass),
+      (GBaseInitFunc) gst_x_overlay_class_init,
+      NULL,
+      NULL,
+      NULL,
+      NULL,
+      0,
+      0,
+      NULL,
+    };
+
+    gst_x_overlay_type = g_type_register_static (G_TYPE_INTERFACE,
+						 "GstXOverlay",
+						 &gst_x_overlay_info, 0);
+    g_type_interface_add_prerequisite (gst_x_overlay_type,
+				       GST_TYPE_INTERFACE);
+  }
+
+  return gst_x_overlay_type;
+}
+
+static void
+gst_x_overlay_class_init (GstXOverlayClass *klass)
+{
+  /* default virtual functions */
+  klass->set_xwindow_id = NULL;
+}
+
+void
+gst_x_overlay_set_xwindow_id (GstXOverlay *overlay,
+			      XID          xwindow_id)
+{
+  GstXOverlayClass *klass = GST_X_OVERLAY_GET_CLASS (overlay);
+
+  if (klass->set_xwindow_id) {
+    klass->set_xwindow_id (overlay, xwindow_id);
+  }
+}
diff --git a/gst-libs/gst/xoverlay/xoverlay.h b/gst-libs/gst/xoverlay/xoverlay.h
new file mode 100644
index 00000000..15258765
--- /dev/null
+++ b/gst-libs/gst/xoverlay/xoverlay.h
@@ -0,0 +1,61 @@
+/* GStreamer X-based Overlay
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * x-overlay.h: X-based overlay interface design
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __GST_X_OVERLAY_H__
+#define __GST_X_OVERLAY_H__
+
+#include <gst/gst.h>
+#include <X11/Xlib.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_X_OVERLAY \
+  (gst_x_overlay_get_type ())
+#define GST_X_OVERLAY(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_X_OVERLAY, GstXOverlay))
+#define GST_X_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_X_OVERLAY, GstXOverlayClass))
+#define GST_IS_X_OVERLAY(obj) \
+  (GST_INTERFACE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_X_OVERLAY))
+#define GST_IS_X_OVERLAY_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_X_OVERLAY))
+#define GST_X_OVERLAY_GET_CLASS(inst) \
+  (G_TYPE_INSTANCE_GET_INTERFACE ((inst), GST_TYPE_X_OVERLAY, GstXOverlayClass))
+
+typedef struct _GstXOverlay GstXOverlay;
+
+typedef struct _GstXOverlayClass {
+  GTypeInterface klass;
+
+  /* virtual functions */
+  void (* set_xwindow_id) (GstXOverlay *overlay,
+			   XID          xwindow_id);
+} GstXOverlayClass;
+
+GType	gst_x_overlay_get_type		(void);
+
+/* virtual class function wrappers */
+void	gst_x_overlay_set_xwindow_id	(GstXOverlay *overlay,
+					 XID          xwindow_id);
+
+G_END_DECLS
+
+#endif /* __GST_X_OVERLAY_H__ */
diff --git a/gst-libs/gst/xwindowlistener/Makefile.am b/gst-libs/gst/xwindowlistener/Makefile.am
new file mode 100644
index 00000000..a3a589ba
--- /dev/null
+++ b/gst-libs/gst/xwindowlistener/Makefile.am
@@ -0,0 +1,11 @@
+librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@
+
+library_LTLIBRARIES = libgstxwindowlistener.la
+
+libgstxwindowlistener_la_SOURCES = xwindowlistener.c
+
+libraryincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/xwindowlistener
+libraryinclude_HEADERS = xwindowlistener.h
+
+libgstxwindowlistener_la_CFLAGS = $(GST_CFLAGS) $(X_CFLAGS)
+libgstxwindowlistener_la_LIBADD = $(GST_LIBS) $(GST_PLUGIN_LIBS) $(X_LIBS)
diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.c b/gst-libs/gst/xwindowlistener/xwindowlistener.c
new file mode 100644
index 00000000..0a400a53
--- /dev/null
+++ b/gst-libs/gst/xwindowlistener/xwindowlistener.c
@@ -0,0 +1,656 @@
+/* G-Streamer X11 Window event/motion listener
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * xwindowlistener.c: implementation of the object
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <gst/gst.h>
+#include "xwindowlistener.h"
+
+#define NUM_CLIPS 1024
+
+static void gst_x_window_listener_class_init (GstXWindowListenerClass *klass);
+static void gst_x_window_listener_init       (GstXWindowListener *xwin);
+static void gst_x_window_listener_dispose    (GObject            *object);
+
+static void gst_xwin_start		     (GstXWindowListener *xwin);
+static void gst_xwin_stop		     (GstXWindowListener *xwin);
+
+static GObjectClass *parent_class = NULL;
+
+GType
+gst_x_window_listener_get_type (void)
+{
+  static GType x_window_listener_type = 0;
+
+  if (!x_window_listener_type) {
+    static const GTypeInfo x_window_listener_info = {
+      sizeof (GstXWindowListenerClass),
+      NULL,
+      NULL,
+      (GClassInitFunc) gst_x_window_listener_class_init,
+      NULL,
+      NULL,
+      sizeof (GstXWindowListener),
+      0,
+      (GInstanceInitFunc) gst_x_window_listener_init,
+      NULL
+    };
+
+    x_window_listener_type =
+	g_type_register_static (G_TYPE_OBJECT,
+				"GstXWindowListener",
+				&x_window_listener_info, 0);
+  }
+
+  return x_window_listener_type;
+}
+
+static void
+gst_x_window_listener_class_init (GstXWindowListenerClass *klass)
+{
+  GObjectClass *object_klass = (GObjectClass *) klass;
+
+  parent_class = g_type_class_ref (G_TYPE_OBJECT);
+
+  object_klass->dispose = gst_x_window_listener_dispose;
+}
+
+static void
+gst_x_window_listener_init (GstXWindowListener *xwin)
+{
+  xwin->xwindow_id = 0;
+  xwin->display_name = NULL;
+
+  xwin->map_window_func = NULL;
+  xwin->set_window_func = NULL;
+
+  xwin->thread = NULL;
+}
+
+static void
+gst_x_window_listener_dispose (GObject *object)
+{
+  GstXWindowListener *xwin = GST_X_WINDOW_LISTENER (object);
+
+  /* stop overlay */
+  gst_x_window_listener_set_xid (xwin, 0);
+
+  if (xwin->display_name) {
+    g_free (xwin->display_name);
+  }
+
+  if (parent_class->dispose) {
+    parent_class->dispose (object);
+  }
+}
+
+GstXWindowListener *
+gst_x_window_listener_new (gchar           *display,
+			   MapWindowFunc    map_window_func,
+			   SetWindowFunc    set_window_func,
+			   gpointer         private_data)
+{
+  GstXWindowListener *xwin =
+	g_object_new (GST_TYPE_X_WINDOW_LISTENER, NULL);
+
+  xwin->display_name = g_strdup (display);
+  xwin->map_window_func = map_window_func;
+  xwin->set_window_func = set_window_func;
+  xwin->private_data = private_data;
+
+  return xwin;
+}
+
+void
+gst_x_window_listener_set_xid (GstXWindowListener *xwin,
+			       XID                 id)
+{
+  g_return_if_fail (xwin != NULL);
+
+  if (id == xwin->xwindow_id) {
+    return;
+  }
+
+  if (xwin->xwindow_id && xwin->thread) {
+    gst_xwin_stop (xwin);
+  }
+
+  xwin->xwindow_id = id;
+
+  if (xwin->xwindow_id &&
+      xwin->display_name &&
+      xwin->display_name[0] == ':') {
+    g_return_if_fail (xwin->map_window_func != NULL);
+    g_return_if_fail (xwin->set_window_func != NULL);
+
+    gst_xwin_start (xwin);
+  }
+}
+
+/*
+ * The following code works as follows:
+ *  - the "client" (the one who uses this object) sets an XID
+ *  - we add a child XWindow to this XID, and follow motion/events
+ *  - after each event, we determine the position, size and clips
+ *  - next, we call the per-instance virtual functions set by the client
+ *  - and we do all this in an endless cycle
+ *
+ * Unfortunately, part of this code is inspired by XawTV, so the
+ * runtime license for this code as a whole will be GPL unless
+ * someone can rewrite this or ask permission to the original
+ * author (Gerd Knorr <kraxel@bytesex.org>) to let us re-license
+ * this piece of code to LGPL.
+ */
+
+#define DEBUG(format, args...) \
+  GST_DEBUG ("XWL: " format, ##args)
+
+static void
+gst_xwin_set_overlay (GstXWindowListener *xwin,
+		      gboolean       on)
+{
+  xwin->map_window_func (xwin->private_data, on);
+
+  /* remember me */
+  xwin->ov_visible = on;
+}
+
+static gboolean
+gst_xwin_refresh (gpointer data)
+{
+  GstXWindowListener *xwin = GST_X_WINDOW_LISTENER (data);
+  Window win, tmp;
+  XSetWindowAttributes xswa;
+  XWindowAttributes attr;
+
+  g_mutex_lock (xwin->main_lock);
+
+  win = DefaultRootWindow (xwin->main_display);
+  XGetWindowAttributes (xwin->main_display, win, &attr);
+
+  xwin->ov_refresh_id = 0;
+
+  if (!xwin->ov_move && xwin->ov_map &&
+      xwin->ov_visibility == VisibilityUnobscured) {
+    g_mutex_unlock (xwin->main_lock);
+    return FALSE; /* skip */
+  }
+
+  if (xwin->ov_map &&
+      xwin->ov_visibility != VisibilityFullyObscured) {
+    xwin->ov_refresh = TRUE;
+  }
+
+  xswa.override_redirect = True;
+  xswa.backing_store = NotUseful;
+  xswa.save_under = False;
+  tmp = XCreateWindow (xwin->main_display,win, 0, 0,
+		       attr.width, attr.height, 0,
+		       CopyFromParent, InputOutput, CopyFromParent,
+		       (CWSaveUnder | CWBackingStore| CWOverrideRedirect ),
+		       &xswa);
+  XMapWindow (xwin->main_display, tmp);
+  XUnmapWindow (xwin->main_display, tmp);
+  XDestroyWindow (xwin->main_display, tmp);
+  xwin->ov_move = FALSE;
+
+  g_mutex_unlock (xwin->main_lock);
+
+  /* once */
+  return FALSE;
+}
+
+static int
+x11_error_dev_null (Display     *display,
+		    XErrorEvent *event)
+{
+    return 0;
+}
+
+#define ADD_CLIP(_x, _y, _w, _h) \
+  do { \
+    GstXWindowClip *clip = &xwin->clips[xwin->num_clips++]; \
+    clip->x_offset = _x; \
+    clip->y_offset = _y; \
+    clip->width = _w; \
+    clip->height = _h; \
+    clip->data = NULL; \
+  } while (0);
+
+static void
+gst_xwin_set_clips (GstXWindowListener *xwin)
+{
+  Window root, rroot, parent, *kids, me;
+  XWindowAttributes attr;
+  guint numkids;
+  gint i;
+  gint x1, y1, w1, h1;
+  void *old_handler;
+
+  old_handler = XSetErrorHandler (x11_error_dev_null);
+
+  if (xwin->num_clips != 0)
+    xwin->ov_conf = TRUE;
+  xwin->num_clips = 0;
+
+  root = DefaultRootWindow (xwin->display);
+  XGetWindowAttributes (xwin->display, root, &attr);
+
+  if (xwin->x < 0)
+    ADD_CLIP (0, 0, -xwin->x, xwin->h);
+  if (xwin->y < 0)
+    ADD_CLIP (0, 0, xwin->w, -xwin->y);
+  if ((xwin->x + xwin->w) > attr.width)
+    ADD_CLIP (attr.width - xwin->x, 0, xwin->w, xwin->h);
+  if ((xwin->y + xwin->h) > attr.height)
+    ADD_CLIP (0, attr.height - xwin->y, xwin->w, xwin->h);
+
+  me = xwin->child;
+  while (1) {
+    XQueryTree (xwin->display, me, &rroot, &parent, &kids, &numkids);
+    if (numkids)
+      XFree (kids);
+    if (root == parent)
+      break;
+    me = parent;
+  }
+
+  XQueryTree (xwin->display, root, &rroot, &parent, &kids, &numkids);
+  for (i = 0; i < numkids; i++)
+    if (kids[i] == me)
+      break;
+
+  for (i++; i < numkids; i++) {
+    XGetWindowAttributes (xwin->display, kids[i], &attr);
+    if (attr.map_state != IsViewable)
+      continue;
+
+    x1 = attr.x - xwin->x;
+    y1 = attr.y - xwin->y;
+    w1 = attr.width + 2 * attr.border_width;
+    h1 = attr.height + 2 * attr.border_width;
+    if (((x1 + w1) < 0) || (x1 > xwin->w) ||
+        ((y1 + h1) < 0) || (y1 > xwin->h))
+      continue;
+	
+    if (x1 < 0)
+      x1 = 0;
+    if (y1 < 0)
+      y1 = 0;
+    ADD_CLIP (x1, y1, w1, h1);
+  }
+  XFree (kids);
+
+  if (xwin->num_clips != 0)
+    xwin->ov_conf = TRUE;
+
+  XSetErrorHandler (old_handler);
+}
+
+
+static gboolean
+gst_xwin_window (GstXWindowListener *xwin)
+{
+  if (xwin->ov_map && xwin->ov_wmmap &&
+      xwin->ov_visibility != VisibilityFullyObscured) {
+    /* visible */
+    if (xwin->ov_visibility == VisibilityPartiallyObscured) {
+      /* set clips */
+      gst_xwin_set_clips (xwin);
+    }
+
+    if (xwin->ov_conf) {
+      xwin->set_window_func (xwin->private_data,
+			     xwin->x, xwin->y,
+			     xwin->w, xwin->h,
+			     xwin->clips, xwin->num_clips);
+
+      if (!xwin->ov_visible)
+        gst_xwin_set_overlay (xwin, TRUE);
+
+      g_mutex_lock (xwin->main_lock);
+
+      if (xwin->ov_refresh_id)
+        g_source_remove (xwin->ov_refresh_id);
+      xwin->ov_refresh_id =
+	  g_timeout_add (200, (GSourceFunc) gst_xwin_refresh,
+			 (gpointer) xwin);
+
+      xwin->ov_conf = FALSE;
+
+      g_mutex_unlock (xwin->main_lock);
+    }
+  } else {
+    /* not visible */
+    if (xwin->ov_conf && xwin->ov_visible) {
+      gst_xwin_set_overlay (xwin, FALSE);
+
+      g_mutex_lock (xwin->main_lock);
+
+      if (xwin->ov_refresh_id)
+        g_source_remove (xwin->ov_refresh_id);
+      xwin->ov_refresh_id =
+	  g_timeout_add (200, (GSourceFunc) gst_xwin_refresh,
+			 (gpointer) xwin);
+
+      xwin->ov_conf = FALSE;
+
+      g_mutex_unlock (xwin->main_lock);
+    }
+  }
+
+  xwin->ov_conf_id = 0;
+
+  /* once is enough */
+  return FALSE;
+}
+
+static void
+gst_xwin_configure (GstXWindowListener *xwin)
+{
+#if 0
+  /* This part is disabled, because the idle task will be done
+   * in the main thread instead of here. */
+  if (!xwin->ov_conf_id)
+    xwin->ov_conf_id =
+	g_idle_add ((GSourceFunc) gst_rec_xoverlay_window,
+		    (gpointer) xwin);
+#endif
+
+  gst_xwin_window ((gpointer) xwin);
+}
+
+static void
+gst_xwin_resize (GstXWindowListener *xwin)
+{
+  Drawable drawable, parent, *kids, root;
+  guint numkids;
+  XWindowAttributes attr;
+
+  XGetWindowAttributes (xwin->display,
+			xwin->xwindow_id, &attr);
+  XMoveResizeWindow (xwin->display, xwin->child,
+		     0, 0, attr.width, attr.height);
+
+  /* set the video window - the first clip is our own window */
+  xwin->x = 0;
+  xwin->y = 0;
+  xwin->w = attr.width;
+  xwin->h = attr.height;
+
+  drawable = xwin->child;
+  while (1) {
+    XQueryTree (xwin->display, drawable,
+		&root, &parent, &kids, &numkids);
+    if (numkids)
+      XFree(kids);
+    drawable = parent;
+    XGetWindowAttributes (xwin->display, drawable, &attr);
+    xwin->x += attr.x;
+    xwin->y += attr.y;
+    if (parent == attr.root)
+      break;
+  }
+
+  xwin->ov_conf = TRUE;
+  xwin->ov_move = TRUE;
+
+  gst_xwin_configure (xwin);
+}
+
+static void
+gst_xwin_init_window (GstXWindowListener *xwin)
+{
+  XWindowAttributes attr;
+
+  /* start values */
+  xwin->ov_conf = TRUE;
+  xwin->ov_map = xwin->ov_wmmap = TRUE;
+  xwin->ov_move = TRUE;
+  xwin->ov_refresh = FALSE;
+  g_mutex_lock (xwin->main_lock);
+  xwin->ov_conf_id = xwin->ov_refresh_id = 0;
+  g_mutex_unlock (xwin->main_lock);
+  xwin->ov_visibility = VisibilityFullyObscured;
+
+  /* start the memory that we'll use */
+  xwin->clips = g_malloc (sizeof (GstXWindowClip) * NUM_CLIPS);
+  xwin->num_clips = 0;
+
+  /* open connection to X server */
+  xwin->display = XOpenDisplay (xwin->display_name);
+
+  /* window */
+  XGetWindowAttributes (xwin->display,
+			xwin->xwindow_id, &attr);
+  xwin->child = XCreateSimpleWindow (xwin->display,
+				     xwin->xwindow_id, 0, 0,
+				     attr.width, attr.height, 0, 0, 0);
+
+  /* listen to certain X events */
+  XSelectInput (xwin->display, xwin->xwindow_id,
+		StructureNotifyMask);
+  XSelectInput (xwin->display, xwin->child,
+		VisibilityChangeMask | StructureNotifyMask);
+  XSelectInput (xwin->display, DefaultRootWindow (xwin->display),
+		VisibilityChangeMask | StructureNotifyMask |
+		SubstructureNotifyMask);
+
+  /* show */
+  XMapWindow (xwin->display, xwin->child);
+
+  gst_xwin_resize (xwin);
+}
+
+static void
+gst_xwin_exit_window (GstXWindowListener *xwin)
+{
+  /* disable overlay */
+  gst_xwin_set_overlay (xwin, FALSE);
+
+  /* delete idle funcs */
+  if (xwin->ov_conf_id != 0)
+    g_source_remove (xwin->ov_conf_id);
+
+  g_mutex_lock (xwin->main_lock);
+  if (xwin->ov_refresh_id != 0)
+    g_source_remove (xwin->ov_refresh_id);
+  g_mutex_unlock (xwin->main_lock);
+
+  /* get away from X and free mem */
+  XDestroyWindow (xwin->display, xwin->child);
+  XCloseDisplay (xwin->display);
+  g_free (xwin->clips);
+}
+
+static gpointer
+gst_xwin_thread (gpointer data)
+{
+  GstXWindowListener *xwin = GST_X_WINDOW_LISTENER (data);
+  XEvent event;
+
+  /* Hi, I'm GStreamer. What's your name? */
+  gst_xwin_init_window (xwin);
+
+  while (xwin->cycle) {
+    XNextEvent (xwin->display, &event);
+
+    if (!xwin->cycle)
+      break;
+
+    if ((event.type == ConfigureNotify &&
+         event.xconfigure.window == xwin->xwindow_id) ||
+        (event.type == MapNotify &&
+         event.xmap.window == xwin->xwindow_id) ||
+        (event.type == UnmapNotify &&
+         event.xunmap.window == xwin->xwindow_id)) {
+      /* the 'parent' window, i.e. the widget provided by client */
+      switch (event.type) {
+        case MapNotify:
+          xwin->ov_map = TRUE;
+          xwin->ov_conf = TRUE;
+          gst_xwin_configure (xwin);
+          break;
+
+        case UnmapNotify:
+          xwin->ov_map = FALSE;
+          xwin->ov_conf = TRUE;
+          gst_xwin_configure (xwin);
+          break;
+
+        case ConfigureNotify:
+          gst_xwin_resize (xwin);
+          break;
+
+        default:
+          /* nothing */
+          break;
+      }
+    } else if (event.xany.window == xwin->child) {
+      /* our own private window */
+      switch (event.type) {
+        case Expose:
+          if (!event.xexpose.count) {
+            if (xwin->ov_refresh) {
+              xwin->ov_refresh = FALSE;
+            } else {
+              xwin->ov_conf = TRUE;
+              gst_xwin_configure (xwin);
+            }
+          }
+          break;
+
+        case VisibilityNotify:
+          xwin->ov_visibility = event.xvisibility.state;
+          if (xwin->ov_refresh) {
+            if (event.xvisibility.state != VisibilityFullyObscured)
+              xwin->ov_refresh = FALSE;
+          } else {
+            xwin->ov_conf = TRUE;
+            gst_xwin_configure (xwin);
+          }
+          break;
+
+        default:
+          /* nothing */
+          break;
+      }
+    } else {
+      /* root window */
+      switch (event.type) {
+        case MapNotify:
+        case UnmapNotify:
+          /* are we still visible? */
+          if (!xwin->ov_refresh) {
+            XWindowAttributes attr;
+            gboolean on;
+            XGetWindowAttributes (xwin->display,
+				  xwin->xwindow_id, &attr);
+            on = (attr.map_state == IsViewable);
+            xwin->ov_wmmap = on;
+            xwin->ov_conf = TRUE;
+            gst_xwin_configure (xwin);
+          }
+          break;
+
+        case ConfigureNotify:
+          if (!xwin->ov_refresh) {
+            gst_xwin_resize (xwin);
+          }
+          break;
+
+        default:
+          /* nothing */
+          break;
+      }
+    }
+  }
+
+  /* Nice to have met you, see you later */
+  gst_xwin_exit_window (xwin);
+
+  g_thread_exit (NULL);
+
+  return NULL;
+}
+
+static void
+gst_xwin_start (GstXWindowListener *xwin)
+{
+  DEBUG ("Starting XWindow listener");
+
+  xwin->cycle = TRUE;
+  /* we use this main_display for two things: first of all,
+   * the window needs to be 'refreshed' to remove artifacts
+   * after every move. Secondly, we use this to 'unhang' the
+   * event handler after we've stopped it */
+  xwin->main_lock = g_mutex_new ();
+  xwin->main_display = XOpenDisplay (xwin->display_name);
+  xwin->thread = g_thread_create (gst_xwin_thread,
+					(gpointer) xwin,
+					TRUE, NULL);
+
+  DEBUG ("Started X-overlay");
+}
+
+static void
+gst_xwin_stop (GstXWindowListener *xwin)
+{
+  DEBUG ("Stopping XWindow listener");
+
+  xwin->cycle = FALSE;
+  /* now, the event loop will hang. To prevent this from hanging
+   * our app, app, we re-do our refresh hack. Oh man, this is
+   * ugly. But it works. :). */
+  g_mutex_lock (xwin->main_lock);
+  if (xwin->ov_refresh_id)
+    g_source_remove (xwin->ov_refresh_id);
+  g_mutex_unlock (xwin->main_lock);
+
+  gst_xwin_refresh ((gpointer) xwin);
+  g_thread_join (xwin->thread);
+  XCloseDisplay (xwin->main_display);
+  g_mutex_free (xwin->main_lock);
+
+  DEBUG ("Stopped X-overlay");
+}
+
+/*
+ * End of code inspired by XawTV.
+ */
+
+static gboolean
+plugin_init (GModule   *module,
+	     GstPlugin *plugin)
+{
+  gst_plugin_set_longname (plugin,
+			   "X11-based XWindow event/motion listener");
+  return TRUE;
+}
+
+GstPluginDesc plugin_desc = {
+  GST_VERSION_MAJOR,
+  GST_VERSION_MINOR,
+  "xwindowlistener",
+  plugin_init
+};
diff --git a/gst-libs/gst/xwindowlistener/xwindowlistener.h b/gst-libs/gst/xwindowlistener/xwindowlistener.h
new file mode 100644
index 00000000..834be67c
--- /dev/null
+++ b/gst-libs/gst/xwindowlistener/xwindowlistener.h
@@ -0,0 +1,116 @@
+/* G-Streamer X11 Window event/motion listener
+ * Copyright (C) 2003 Ronald Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * xwindowlistener.h: object definition
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+#ifndef __X_WINDOW_LISTENER_H__
+#define __X_WINDOW_LISTENER_H__
+
+#include <gst/gst.h>
+#include <X11/Xlib.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_X_WINDOW_LISTENER \
+  (gst_x_window_listener_get_type())
+#define GST_X_WINDOW_LISTENER(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST((obj), GST_TYPE_X_WINDOW_LISTENER, \
+			      GstXWindowListener))
+#define GST_X_WINDOW_LISTENER_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST((klass), GST_TYPE_X_WINDOW_LISTENER, \
+			   GstXWindowListenerClass))
+#define GST_IS_X_WINDOW_LISTENER(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE((obj), GST_TYPE_X_WINDOW_LISTENER))
+#define GST_IS_X_WINDOW_LISTENER_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE((klass), GST_TYPE_X_WINDOW_LISTENER))
+
+typedef struct _GstXWindowListener	GstXWindowListener;
+typedef struct _GstXWindowListenerClass	GstXWindowListenerClass;
+typedef struct _GstXWindowClip		GstXWindowClip;
+typedef void (* MapWindowFunc)		(gpointer your_data,
+					 gboolean visible);
+typedef void (* SetWindowFunc)		(gpointer your_data,
+					 gint x,  gint y,
+					 gint w,  gint h,
+					 GstXWindowClip *clips,
+					 gint     num_clips);
+
+struct _GstXWindowClip {
+  gint32   x_offset,
+	   y_offset,
+	   width,
+	   height;
+  gpointer data;
+};
+
+struct _GstXWindowListener {
+  GObject  parent;
+
+  /* "per-instance virtual functions" */
+  MapWindowFunc map_window_func;
+  SetWindowFunc set_window_func;
+
+  /* private data with which we call the virtual functions */
+  gpointer private_data;
+
+  /* general information of what we're doing */
+  gchar   *display_name;
+  XID      xwindow_id;
+
+  /* one extra... */
+  Display *main_display;
+  GMutex  *main_lock;
+
+  /* oh my g*d, this is going to be so horribly ugly */
+  GThread *thread;
+  gboolean cycle;
+
+  /* the overlay window + own thread */
+  Display *display;
+  Drawable child;
+  gboolean ov_conf,
+	   ov_map,
+	   ov_visible,
+	   ov_refresh,
+	   ov_move,
+	   ov_wmmap;
+  gint     ov_visibility;
+  guint    ov_conf_id,
+	   ov_refresh_id;
+  gint     x, y, w, h;
+  GstXWindowClip *clips;
+  gint     num_clips;
+};
+
+struct _GstXWindowListenerClass {
+  GObjectClass parent;
+};
+
+GType 	gst_x_window_listener_get_type	(void);
+GstXWindowListener *
+	gst_x_window_listener_new	(gchar              *display,
+					 MapWindowFunc       map_window_func,
+					 SetWindowFunc       set_window_func,
+					 gpointer            private_data);
+void	gst_x_window_listener_set_xid	(GstXWindowListener *xwin,
+					 XID                 id);
+
+G_END_DECLS
+
+#endif /* __X_WINDOW_LISTENER_H__ */