diff -puNr gst-plugins-good.orig/configure.ac gst-plugins-good/configure.ac
--- gst-plugins-good.orig/configure.ac	2006-01-19 22:00:50.000000000 +0100
+++ gst-plugins-good/configure.ac	2006-01-29 16:47:14.000000000 +0100
@@ -384,6 +384,14 @@ GST_CHECK_FEATURE(GCONF, [GConf librarie
   AC_SUBST(GCONF_LIBS)
 ])
 
+dnl *** HAL ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_HAL, true)
+GST_CHECK_FEATURE(HAL, [HAL libraries], , [
+  PKG_CHECK_MODULES(HAL, [hal >= 0.5.6, dbus-1 >= 0.32], HAVE_HAL="yes", HAVE_HAL="no")
+  AC_SUBST(HAL_CFLAGS)
+  AC_SUBST(HAL_LIBS)
+])
+
 dnl *** jpeg ***
 dnl FIXME: we could use header checks here as well IMO
 translit(dnm, m, l) AM_CONDITIONAL(USE_JPEG, true)
@@ -614,6 +622,7 @@ ext/dv/Makefile
 ext/esd/Makefile
 ext/flac/Makefile
 ext/gconf/Makefile
+ext/hal/Makefile
 ext/ladspa/Makefile
 ext/libcaca/Makefile
 ext/libpng/Makefile
diff -puNr gst-plugins-good.orig/ext/hal/gsthalaudiosink.c gst-plugins-good/ext/hal/gsthalaudiosink.c
--- gst-plugins-good.orig/ext/hal/gsthalaudiosink.c	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalaudiosink.c	2006-01-28 18:46:28.000000000 +0100
@@ -0,0 +1,231 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2006 Jürg Billeter <j@bitron.ch>
+ *
+ * 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 "gsthalelements.h"
+#include "gsthalaudiosink.h"
+
+static void gst_hal_audio_sink_dispose (GObject * object);
+static GstStateChangeReturn
+gst_hal_audio_sink_change_state (GstElement * element,
+    GstStateChange transition);
+
+enum
+{
+  PROP_0,
+  PROP_UDI
+};
+
+GST_BOILERPLATE (GstHalAudioSink, gst_hal_audio_sink, GstBin, GST_TYPE_BIN);
+
+static void gst_hal_audio_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_hal_audio_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void
+gst_hal_audio_sink_base_init (gpointer klass)
+{
+  GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
+  GstElementDetails gst_hal_audio_sink_details = {
+    "HAL audio sink",
+    "Sink/Audio",
+    "Audio sink for sound device access via HAL",
+    "Jürg Billeter <j@bitron.ch>"
+  };
+  GstStaticPadTemplate sink_template = GST_STATIC_PAD_TEMPLATE ("sink",
+      GST_PAD_SINK,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS_ANY);
+
+  gst_element_class_add_pad_template (eklass,
+      gst_static_pad_template_get (&sink_template));
+  gst_element_class_set_details (eklass, &gst_hal_audio_sink_details);
+}
+
+static void
+gst_hal_audio_sink_class_init (GstHalAudioSinkClass * klass)
+{
+  GObjectClass *oklass = G_OBJECT_CLASS (klass);
+  GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
+
+  oklass->set_property = gst_hal_audio_sink_set_property;
+  oklass->get_property = gst_hal_audio_sink_get_property;
+  oklass->dispose = gst_hal_audio_sink_dispose;
+  eklass->change_state = gst_hal_audio_sink_change_state;
+
+  g_object_class_install_property (oklass, PROP_UDI,
+      g_param_spec_string ("udi",
+          "UDI",
+          "Unique Device Id",
+          NULL, G_PARAM_READWRITE));
+}
+
+/*
+ * Hack to make negotiation work.
+ */
+
+static void
+gst_hal_audio_sink_reset (GstHalAudioSink * sink)
+{
+  GstPad *targetpad;
+
+  /* fakesink */
+  if (sink->kid) {
+    gst_element_set_state (sink->kid, GST_STATE_NULL);
+    gst_bin_remove (GST_BIN (sink), sink->kid);
+  }
+  sink->kid = gst_element_factory_make ("fakesink", "testsink");
+  gst_bin_add (GST_BIN (sink), sink->kid);
+
+  targetpad = gst_element_get_pad (sink->kid, "sink");
+  gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad);
+  gst_object_unref (targetpad);
+}
+
+static void
+gst_hal_audio_sink_init (GstHalAudioSink * sink,
+    GstHalAudioSinkClass * g_class)
+{
+  sink->pad = gst_ghost_pad_new_no_target ("sink", GST_PAD_SINK);
+  gst_element_add_pad (GST_ELEMENT (sink), sink->pad);
+
+  gst_hal_audio_sink_reset (sink);
+}
+
+static void
+gst_hal_audio_sink_dispose (GObject * object)
+{
+  GstHalAudioSink *sink = GST_HAL_AUDIO_SINK (object);
+
+  if (sink->udi) {
+    g_free (sink->udi);
+    sink->udi = NULL;
+  }
+
+  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+}
+
+static gboolean
+do_toggle_element (GstHalAudioSink * sink)
+{
+  GstPad *targetpad;
+
+  /* kill old element */
+  if (sink->kid) {
+    GST_DEBUG_OBJECT (sink, "Removing old kid");
+    gst_element_set_state (sink->kid, GST_STATE_NULL);
+    gst_bin_remove (GST_BIN (sink), sink->kid);
+    sink->kid = NULL;
+  }
+
+  GST_DEBUG_OBJECT (sink, "Creating new kid");
+  if (!(sink->kid = gst_hal_get_audio_sink (sink->udi))) {
+    GST_ELEMENT_ERROR (sink, LIBRARY, SETTINGS, (NULL),
+        ("Failed to render audio sink from Hal"));
+    return FALSE;
+  }
+  gst_element_set_state (sink->kid, GST_STATE (sink));
+  gst_bin_add (GST_BIN (sink), sink->kid);
+
+  /* re-attach ghostpad */
+  GST_DEBUG_OBJECT (sink, "Creating new ghostpad");
+  targetpad = gst_element_get_pad (sink->kid, "sink");
+  gst_ghost_pad_set_target (GST_GHOST_PAD (sink->pad), targetpad);
+  gst_object_unref (targetpad);
+  GST_DEBUG_OBJECT (sink, "done changing hal audio sink");
+
+  return TRUE;
+}
+
+static void
+gst_hal_audio_sink_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstHalAudioSink *this = GST_HAL_AUDIO_SINK (object);
+
+  GST_OBJECT_LOCK (this);
+
+  switch (prop_id) {
+    case PROP_UDI:
+      if (this->udi)
+        g_free (this->udi);
+      this->udi = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (this);
+}
+
+static void
+gst_hal_audio_sink_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstHalAudioSink *this = GST_HAL_AUDIO_SINK (object);
+
+  GST_OBJECT_LOCK (this);
+
+  switch (prop_id) {
+    case PROP_UDI:
+      g_value_set_string (value, this->udi);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (this);
+}
+
+static GstStateChangeReturn
+gst_hal_audio_sink_change_state (GstElement * element,
+    GstStateChange transition)
+{
+  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
+  GstHalAudioSink *sink = GST_HAL_AUDIO_SINK (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!do_toggle_element (sink))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
+      (element, transition), GST_STATE_CHANGE_SUCCESS);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      gst_hal_audio_sink_reset (sink);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
diff -puNr gst-plugins-good.orig/ext/hal/gsthalaudiosink.h gst-plugins-good/ext/hal/gsthalaudiosink.h
--- gst-plugins-good.orig/ext/hal/gsthalaudiosink.h	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalaudiosink.h	2006-01-29 16:55:50.000000000 +0100
@@ -0,0 +1,58 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2006 Jürg Billeter <j@bitron.ch>
+ *
+ * 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_HAL_AUDIO_SINK_H__
+#define __GST_HAL_AUDIO_SINK_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_HAL_AUDIO_SINK \
+  (gst_hal_audio_sink_get_type ())
+#define GST_HAL_AUDIO_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_HAL_AUDIO_SINK, \
+                               GstHalAudioSink))
+#define GST_HAL_AUDIO_SINK_CLASS(klass) \
+  (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_HAL_AUDIO_SINK, \
+                            GstHalAudioSink))
+#define GST_IS_HAL_AUDIO_SINK(obj) \
+  (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_HAL_AUDIO_SINK))
+#define GST_IS_HAL_AUDIO_SINK_CLASS(obj) \
+  (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_HAL_AUDIO_SINK))
+
+typedef struct _GstHalAudioSink {
+  GstBin parent;
+
+  /* explicit pointers to stuff used */
+  gchar *udi;
+  GstElement *kid;
+  GstPad *pad;
+} GstHalAudioSink;
+
+typedef struct _GstHalAudioSinkClass {
+  GstBinClass parent_class;
+} GstHalAudioSinkClass;
+
+GType   gst_hal_audio_sink_get_type   (void);
+
+G_END_DECLS
+
+#endif /* __GST_HAL_AUDIO_SINK_H__ */
diff -puNr gst-plugins-good.orig/ext/hal/gsthalaudiosrc.c gst-plugins-good/ext/hal/gsthalaudiosrc.c
--- gst-plugins-good.orig/ext/hal/gsthalaudiosrc.c	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalaudiosrc.c	2006-01-28 18:08:16.000000000 +0100
@@ -0,0 +1,232 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2005 Tim-Philipp Müller <tim centricular net>
+ * (c) 2006 Jürg Billeter <j@bitron.ch>
+ *
+ * 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 "gsthalelements.h"
+#include "gsthalaudiosrc.h"
+
+static void gst_hal_audio_src_dispose (GObject * object);
+static GstStateChangeReturn
+gst_hal_audio_src_change_state (GstElement * element,
+    GstStateChange transition);
+
+enum
+{
+  PROP_0,
+  PROP_UDI
+};
+
+GST_BOILERPLATE (GstHalAudioSrc, gst_hal_audio_src, GstBin, GST_TYPE_BIN);
+
+static void gst_hal_audio_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec);
+static void gst_hal_audio_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec);
+
+static void
+gst_hal_audio_src_base_init (gpointer klass)
+{
+  GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
+  GstElementDetails gst_hal_audio_src_details = {
+    "HAL audio source",
+    "Source/Audio",
+    "Audio source for sound device access via HAL",
+    "Jürg Billeter <j@bitron.ch>"
+  };
+  GstStaticPadTemplate src_template = GST_STATIC_PAD_TEMPLATE ("src",
+      GST_PAD_SRC,
+      GST_PAD_ALWAYS,
+      GST_STATIC_CAPS_ANY);
+
+  gst_element_class_add_pad_template (eklass,
+      gst_static_pad_template_get (&src_template));
+  gst_element_class_set_details (eklass, &gst_hal_audio_src_details);
+}
+
+static void
+gst_hal_audio_src_class_init (GstHalAudioSrcClass * klass)
+{
+  GObjectClass *oklass = G_OBJECT_CLASS (klass);
+  GstElementClass *eklass = GST_ELEMENT_CLASS (klass);
+
+  oklass->set_property = gst_hal_audio_src_set_property;
+  oklass->get_property = gst_hal_audio_src_get_property;
+  oklass->dispose = gst_hal_audio_src_dispose;
+  eklass->change_state = gst_hal_audio_src_change_state;
+
+  g_object_class_install_property (oklass, PROP_UDI,
+      g_param_spec_string ("udi",
+          "UDI",
+          "Unique Device Id",
+          NULL, G_PARAM_READWRITE));
+}
+
+/*
+ * Hack to make negotiation work.
+ */
+
+static void
+gst_hal_audio_src_reset (GstHalAudioSrc * src)
+{
+  GstPad *targetpad;
+
+  /* fakesrc */
+  if (src->kid) {
+    gst_element_set_state (src->kid, GST_STATE_NULL);
+    gst_bin_remove (GST_BIN (src), src->kid);
+  }
+  src->kid = gst_element_factory_make ("fakesrc", "testsrc");
+  gst_bin_add (GST_BIN (src), src->kid);
+
+  targetpad = gst_element_get_pad (src->kid, "src");
+  gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad);
+  gst_object_unref (targetpad);
+}
+
+static void
+gst_hal_audio_src_init (GstHalAudioSrc * src,
+    GstHalAudioSrcClass * g_class)
+{
+  src->pad = gst_ghost_pad_new_no_target ("src", GST_PAD_SRC);
+  gst_element_add_pad (GST_ELEMENT (src), src->pad);
+
+  gst_hal_audio_src_reset (src);
+}
+
+static void
+gst_hal_audio_src_dispose (GObject * object)
+{
+  GstHalAudioSrc *src = GST_HAL_AUDIO_SRC (object);
+
+  if (src->udi) {
+    g_free (src->udi);
+    src->udi = NULL;
+  }
+
+  GST_CALL_PARENT (G_OBJECT_CLASS, dispose, (object));
+}
+
+static gboolean
+do_toggle_element (GstHalAudioSrc * src)
+{
+  GstPad *targetpad;
+
+  /* kill old element */
+  if (src->kid) {
+    GST_DEBUG_OBJECT (src, "Removing old kid");
+    gst_element_set_state (src->kid, GST_STATE_NULL);
+    gst_bin_remove (GST_BIN (src), src->kid);
+    src->kid = NULL;
+  }
+
+  GST_DEBUG_OBJECT (src, "Creating new kid");
+  if (!(src->kid = gst_hal_get_audio_src (src->udi))) {
+    GST_ELEMENT_ERROR (src, LIBRARY, SETTINGS, (NULL),
+        ("Failed to render audio source from Hal"));
+    return FALSE;
+  }
+  gst_element_set_state (src->kid, GST_STATE (src));
+  gst_bin_add (GST_BIN (src), src->kid);
+
+  /* re-attach ghostpad */
+  GST_DEBUG_OBJECT (src, "Creating new ghostpad");
+  targetpad = gst_element_get_pad (src->kid, "src");
+  gst_ghost_pad_set_target (GST_GHOST_PAD (src->pad), targetpad);
+  gst_object_unref (targetpad);
+  GST_DEBUG_OBJECT (src, "done changing hal audio source");
+
+  return TRUE;
+}
+
+static void
+gst_hal_audio_src_set_property (GObject * object, guint prop_id,
+    const GValue * value, GParamSpec * pspec)
+{
+  GstHalAudioSrc *this = GST_HAL_AUDIO_SRC (object);
+
+  GST_OBJECT_LOCK (this);
+
+  switch (prop_id) {
+    case PROP_UDI:
+      if (this->udi)
+        g_free (this->udi);
+      this->udi = g_value_dup_string (value);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (this);
+}
+
+static void
+gst_hal_audio_src_get_property (GObject * object, guint prop_id,
+    GValue * value, GParamSpec * pspec)
+{
+  GstHalAudioSrc *this = GST_HAL_AUDIO_SRC (object);
+
+  GST_OBJECT_LOCK (this);
+
+  switch (prop_id) {
+    case PROP_UDI:
+      g_value_set_string (value, this->udi);
+      break;
+    default:
+      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
+      break;
+  }
+
+  GST_OBJECT_UNLOCK (this);
+}
+
+static GstStateChangeReturn
+gst_hal_audio_src_change_state (GstElement * element,
+    GstStateChange transition)
+{
+  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
+  GstHalAudioSrc *src = GST_HAL_AUDIO_SRC (element);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+      if (!do_toggle_element (src))
+        return GST_STATE_CHANGE_FAILURE;
+      break;
+    default:
+      break;
+  }
+
+  ret = GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
+      (element, transition), GST_STATE_CHANGE_SUCCESS);
+
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_NULL:
+      gst_hal_audio_src_reset (src);
+      break;
+    default:
+      break;
+  }
+
+  return ret;
+}
diff -puNr gst-plugins-good.orig/ext/hal/gsthalaudiosrc.h gst-plugins-good/ext/hal/gsthalaudiosrc.h
--- gst-plugins-good.orig/ext/hal/gsthalaudiosrc.h	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalaudiosrc.h	2006-01-29 16:56:20.000000000 +0100
@@ -0,0 +1,52 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2005 Tim-Philipp Müller <tim centricular net>
+ * (c) 2006 Jürg Billeter <j@bitron.ch>
+ *
+ * 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_HAL_AUDIO_SRC_H__
+#define __GST_HAL_AUDIO_SRC_H__
+
+#include <gst/gst.h>
+
+G_BEGIN_DECLS
+
+#define GST_TYPE_HAL_AUDIO_SRC            (gst_hal_audio_src_get_type ())
+#define GST_HAL_AUDIO_SRC(obj)            (G_TYPE_CHECK_INSTANCE_CAST ((obj), GST_TYPE_HAL_AUDIO_SRC, GstHalAudioSrc))
+#define GST_HAL_AUDIO_SRC_CLASS(klass)    (G_TYPE_CHECK_CLASS_CAST ((klass), GST_TYPE_HAL_AUDIO_SRC, GstHalAudioSrc))
+#define GST_IS_HAL_AUDIO_SRC(obj)         (G_TYPE_CHECK_INSTANCE_TYPE ((obj), GST_TYPE_HAL_AUDIO_SRC))
+#define GST_IS_HAL_AUDIO_SRC_CLASS(klass) (G_TYPE_CHECK_CLASS_TYPE ((klass), GST_TYPE_HAL_AUDIO_SRC))
+
+typedef struct _GstHalAudioSrc {
+  GstBin parent;
+
+  /* explicit pointers to stuff used */
+  gchar *udi;
+  GstElement *kid;
+  GstPad *pad;
+} GstHalAudioSrc;
+
+typedef struct _GstHalAudioSrcClass {
+  GstBinClass parent_class;
+} GstHalAudioSrcClass;
+
+GType   gst_hal_audio_src_get_type   (void);
+
+G_END_DECLS
+
+#endif /* __GST_HAL_AUDIO_SRC_H__ */
diff -puNr gst-plugins-good.orig/ext/hal/gsthalelements.c gst-plugins-good/ext/hal/gsthalelements.c
--- gst-plugins-good.orig/ext/hal/gsthalelements.c	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalelements.c	2006-01-29 16:56:42.000000000 +0100
@@ -0,0 +1,54 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2006 Jürg Billeter <j@bitron.ch>
+ *
+ * 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 "gsthalelements.h"
+
+#include "gsthalaudiosink.h"
+#include "gsthalaudiosrc.h"
+
+GST_DEBUG_CATEGORY (hal_debug);
+
+static gboolean
+plugin_init (GstPlugin * plugin)
+{
+  GST_DEBUG_CATEGORY_INIT (hal_debug, "hal", 0,
+      "HAL/GStreamer audio input/output wrapper elements");
+
+  if (!gst_element_register (plugin, "halaudiosink",
+          GST_RANK_NONE, GST_TYPE_HAL_AUDIO_SINK) ||
+      !gst_element_register (plugin, "halaudiosrc",
+          GST_RANK_NONE, GST_TYPE_HAL_AUDIO_SRC)) {
+    return FALSE;
+  }
+
+  return TRUE;
+}
+
+GST_PLUGIN_DEFINE (GST_VERSION_MAJOR,
+    GST_VERSION_MINOR,
+    "halelements",
+    "elements wrapping the GStreamer/HAL audio input/output devices",
+    plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN)
diff -puNr gst-plugins-good.orig/ext/hal/gsthalelements.h gst-plugins-good/ext/hal/gsthalelements.h
--- gst-plugins-good.orig/ext/hal/gsthalelements.h	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/gsthalelements.h	2006-01-28 18:06:51.000000000 +0100
@@ -0,0 +1,29 @@
+/* GStreamer
+ * (c) 2005 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * (c) 2006 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ *
+ * 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_HAL_ELEMENTS_H__
+#define __GST_HAL_ELEMENTS_H__
+
+#include <hal.h>
+
+GST_DEBUG_CATEGORY_EXTERN (hal_debug);
+#define GST_CAT_DEFAULT hal_debug
+
+#endif /* __GST_HAL_ELEMENTS_H__ */
diff -puNr gst-plugins-good.orig/ext/hal/hal.c gst-plugins-good/ext/hal/hal.c
--- gst-plugins-good.orig/ext/hal/hal.c	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/hal.c	2006-01-28 18:45:25.000000000 +0100
@@ -0,0 +1,238 @@
+/* GStreamer
+ * Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
+ * Copyright (C) <2006> Jürg Billeter <j@bitron.ch>
+ *
+ * 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.
+ */
+
+/*
+ * this library handles interaction with Hal
+ */
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include <string.h>
+#include <glib.h>
+#include "hal.h"
+
+
+/* go through a bin, finding the one pad that is unconnected in the given
+ *  * direction, and return that pad */
+static GstPad *
+gst_bin_find_unconnected_pad (GstBin * bin, GstPadDirection direction)
+{
+  GstPad *pad = NULL;
+  GList *elements = NULL;
+  const GList *pads = NULL;
+  GstElement *element = NULL;
+
+  GST_OBJECT_LOCK (bin);
+  elements = bin->children;
+  /* traverse all elements looking for unconnected pads */
+  while (elements && pad == NULL) {
+    element = GST_ELEMENT (elements->data);
+    GST_OBJECT_LOCK (element);
+    pads = element->pads;
+    while (pads) {
+      GstPad *testpad = GST_PAD (pads->data);
+
+      /* check if the direction matches */
+      if (GST_PAD_DIRECTION (testpad) == direction) {
+        GST_OBJECT_LOCK (testpad);
+        if (GST_PAD_PEER (testpad) == NULL) {
+          GST_OBJECT_UNLOCK (testpad);
+          /* found it ! */
+          pad = testpad;
+          break;
+        }
+        GST_OBJECT_UNLOCK (testpad);
+      }
+      pads = g_list_next (pads);
+    }
+    GST_OBJECT_UNLOCK (element);
+    elements = g_list_next (elements);
+  }
+  GST_OBJECT_UNLOCK (bin);
+
+  return pad;
+}
+
+/* external functions */
+
+/**
+ * gst_hal_get_string:
+ * @key: a #gchar corresponding to the key you want to get.
+ *
+ * Get Hal UDI @udi's string value.
+ *
+ * Returns: a newly allocated #gchar string containing the appropriate pipeline
+ * for UDI @udi, or NULL in the case of an error..
+ */
+gchar *
+gst_hal_get_string (const gchar * udi)
+{
+	DBusConnection *connection;
+	DBusError error;
+	LibHalContext *ctx;
+	char *type, *string;
+	char *element;
+	
+	dbus_error_init (&error);
+	
+	connection = dbus_bus_get (DBUS_BUS_SYSTEM, &error);
+	g_return_val_if_fail (connection != NULL, NULL);
+	
+	ctx = libhal_ctx_new ();
+	g_return_val_if_fail (ctx != NULL, NULL);
+	
+	libhal_ctx_set_dbus_connection (ctx, connection);
+	libhal_ctx_init (ctx, &error);
+	
+	string = NULL;
+
+	if (libhal_device_query_capability (ctx, udi, "alsa", &error)) {
+		type = libhal_device_get_property_string (ctx, udi, "alsa.type", &error);
+		if (strcmp (type, "playback") == 0) {
+			element = "alsasink";
+		} else if (strcmp (type, "capture") == 0) {
+			element = "alsasrc";
+		} else {
+			element = NULL;
+		}
+		string = g_strdup_printf ("%s device=plughw:%d,%d", element,
+			libhal_device_get_property_int (ctx, udi, "alsa.card", &error),
+			libhal_device_get_property_int (ctx, udi, "alsa.device", &error));
+	}
+	
+	libhal_ctx_shutdown (ctx, &error);
+	libhal_ctx_free (ctx);
+	
+	dbus_error_free (&error);
+	
+	return string;
+}
+
+/**
+ * gst_hal_render_bin_from_description:
+ * @description: a #gchar string describing the bin.
+ *
+ * Render bin from description @description.
+ *
+ * Returns: a #GstElement containing the rendered bin.
+ */
+GstElement *
+gst_hal_render_bin_from_description (const gchar * description)
+{
+  GstElement *bin = NULL;
+  GstPad *pad = NULL;
+  GError *error = NULL;
+  gchar *desc = NULL;
+
+  /* parse the pipeline to a bin */
+  desc = g_strdup_printf ("bin.( %s )", description);
+  bin = GST_ELEMENT (gst_parse_launch (desc, &error));
+  g_free (desc);
+  if (error) {
+    GST_ERROR ("gsthal: error parsing pipeline %s\n%s\n",
+        description, error->message);
+    g_error_free (error);
+    return NULL;
+  }
+
+  /* find pads and ghost them if necessary */
+  if ((pad = gst_bin_find_unconnected_pad (GST_BIN (bin), GST_PAD_SRC))) {
+    gst_element_add_pad (bin, gst_ghost_pad_new ("src", pad));
+  }
+  if ((pad = gst_bin_find_unconnected_pad (GST_BIN (bin), GST_PAD_SINK))) {
+    gst_element_add_pad (bin, gst_ghost_pad_new ("sink", pad));
+  }
+  return bin;
+}
+
+/**
+ * gst_hal_render_bin_from_udi:
+ * @key: a #gchar string corresponding to a Hal UDI.
+ *
+ * Render bin from Hal UDI @udi.
+ *
+ * Returns: a #GstElement containing the rendered bin.
+ */
+GstElement *
+gst_hal_render_bin_from_udi (const gchar * udi)
+{
+  GstElement *bin = NULL;
+  gchar *value;
+
+  value = gst_hal_get_string (udi);
+  if (value)
+    bin = gst_hal_render_bin_from_description (value);
+  g_free (value);
+  return bin;
+}
+
+/**
+ * gst_hal_get_audio_sink:
+ *
+ * Render audio output bin from GStreamer Hal UDI.
+ * If no device with the specified UDI exists, the default audio sink for the
+ * platform is used (typically osssink or sunaudiosink).
+ *
+ * Returns: a #GstElement containing the audio output bin, or NULL if
+ * everything failed.
+ */
+GstElement *
+gst_hal_get_audio_sink (const gchar * udi)
+{
+  GstElement *ret = gst_hal_render_bin_from_udi (udi);
+
+  if (!ret) {
+    ret = gst_element_factory_make (DEFAULT_AUDIOSINK, NULL);
+
+    if (!ret)
+      g_warning ("No Hal default audio sink key and %s doesn't work",
+          DEFAULT_AUDIOSINK);
+  }
+
+  return ret;
+}
+
+/**
+ * gst_hal_get_audio_src:
+ *
+ * Render audio acquisition bin from GStreamer Hal UDI.
+ * If no device with the specified UDI exists, the default audio source for the
+ * plaform is used (typically osssrc or sunaudiosrc).
+ *
+ * Returns: a #GstElement containing the audio source bin, or NULL if
+ * everything failed.
+ */
+GstElement *
+gst_hal_get_audio_src (const gchar * udi)
+{
+  GstElement *ret = gst_hal_render_bin_from_udi (udi);
+
+  if (!ret) {
+    ret = gst_element_factory_make (DEFAULT_AUDIOSRC, NULL);
+
+    if (!ret)
+      g_warning ("No Hal default audio src key and %s doesn't work",
+          DEFAULT_AUDIOSRC);
+  }
+
+  return ret;
+}
diff -puNr gst-plugins-good.orig/ext/hal/hal.h gst-plugins-good/ext/hal/hal.h
--- gst-plugins-good.orig/ext/hal/hal.h	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/hal.h	2006-01-28 16:56:31.000000000 +0100
@@ -0,0 +1,44 @@
+/* GStreamer
+ * Copyright (C) <2002> Thomas Vander Stichele <thomas@apestaart.org>
+ * Copyright (C) <2006> Jürg Billeter <j@bitron.ch>
+ *
+ * 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_HAL_H
+#define GST_HAL_H
+
+/*
+ * this library handles interaction with Hal
+ */
+
+#include <gst/gst.h>
+#include <dbus/dbus.h>
+#include <libhal.h>
+
+G_BEGIN_DECLS
+
+gchar *         gst_hal_get_string            (const gchar *udi);
+
+GstElement *    gst_hal_render_bin_from_udi           (const gchar *udi);
+GstElement *    gst_hal_render_bin_from_description   (const gchar *description);
+
+GstElement *    gst_hal_get_audio_sink (const gchar *udi);
+GstElement *    gst_hal_get_audio_src  (const gchar *udi);
+
+G_END_DECLS
+
+#endif /* GST_HAL_H */
diff -puNr gst-plugins-good.orig/ext/hal/Makefile.am gst-plugins-good/ext/hal/Makefile.am
--- gst-plugins-good.orig/ext/hal/Makefile.am	1970-01-01 01:00:00.000000000 +0100
+++ gst-plugins-good/ext/hal/Makefile.am	2006-01-29 16:57:59.000000000 +0100
@@ -0,0 +1,17 @@
+plugin_LTLIBRARIES = libgsthalelements.la
+
+libgsthalelements_la_SOURCES = \
+	gsthalaudiosink.c \
+	gsthalaudiosrc.c \
+	gsthalelements.c \
+	hal.c
+
+libgsthalelements_la_CFLAGS = $(GST_CFLAGS) $(HAL_CFLAGS)
+libgsthalelements_la_LIBADD = $(GST_LIBS) $(HAL_LIBS)
+libgsthalelements_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
+
+noinst_HEADERS = \
+	gsthalaudiosink.h \
+	gsthalaudiosrc.h \
+	gsthalelements.h \
+	hal.h
diff -puNr gst-plugins-good.orig/ext/Makefile.am gst-plugins-good/ext/Makefile.am
--- gst-plugins-good.orig/ext/Makefile.am	2006-01-18 20:30:35.000000000 +0100
+++ gst-plugins-good/ext/Makefile.am	2006-01-29 16:47:14.000000000 +0100
@@ -40,6 +40,12 @@ endif
 GDK_PIXBUF_DIR =
 # endif
 
+if USE_HAL
+HAL_DIR = hal
+else
+HAL_DIR =
+endif
+
 if USE_JPEG
 JPEG_DIR = jpeg
 else
@@ -109,6 +115,7 @@ SUBDIRS = \
 	$(FLAC_DIR) \
 	$(GCONF_DIR) \
 	$(GDK_PIXBUF_DIR) \
+	$(HAL_DIR) \
 	$(JPEG_DIR) \
 	$(LADSPA_DIR) \
 	$(LIBCACA_DIR) \
@@ -127,6 +134,7 @@ DIST_SUBDIRS = \
 	esd \
 	flac \
 	gconf \
+	hal \
 	jpeg \
 	ladspa \
 	libcaca \
