1 files changed, 139 insertions, 508 deletions

diff --git a/sys/oss/gstosssink.c b/sys/oss/gstosssink.c
index e9c7438c..7d14feea 100644
--- a/sys/oss/gstosssink.c
+++ b/sys/oss/gstosssink.c
@@ -1,6 +1,6 @@
 /* GStreamer
  * Copyright (C) 1999,2000 Erik Walthinsen <omega@cse.ogi.edu>
- *                    2000 Wim Taymans <wim.taymans@chello.be>
+ *               2000,2005 Wim Taymans <wim@fluendo.com>
  *
  * gstosssink.c: 
  *
@@ -24,23 +24,12 @@
 #include "config.h"
 #endif
 #include <sys/ioctl.h>
+#include <fcntl.h>
 #include <errno.h>
 #include <unistd.h>
 #include <string.h>
-
-#ifdef HAVE_OSS_INCLUDE_IN_SYS
 #include <sys/soundcard.h>
-#else
-
-#ifdef HAVE_OSS_INCLUDE_IN_ROOT
-#include <soundcard.h>
-#else
 
-#include <machine/soundcard.h>
-
-#endif /* HAVE_OSS_INCLUDE_IN_ROOT */
-
-#endif /* HAVE_OSS_INCLUDE_IN_SYS */
 
 #include "gstosssink.h"
 
@@ -57,59 +46,33 @@ static void gst_osssink_class_init (GstOssSinkClass * klass);
 static void gst_osssink_init (GstOssSink * osssink);
 static void gst_osssink_dispose (GObject * object);
 
-static GstElementStateReturn gst_osssink_change_state (GstElement * element);
-static void gst_osssink_set_clock (GstElement * element, GstClock * clock);
-static GstClock *gst_osssink_get_clock (GstElement * element);
-static GstClockTime gst_osssink_get_time (GstClock * clock, gpointer data);
-
-static const GstFormat *gst_osssink_get_formats (GstPad * pad);
-static gboolean gst_osssink_convert (GstPad * pad, GstFormat src_format,
-    gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
-static const GstQueryType *gst_osssink_get_query_types (GstPad * pad);
-static gboolean gst_osssink_query (GstElement * element, GstQueryType type,
-    GstFormat * format, gint64 * value);
-static gboolean gst_osssink_sink_query (GstPad * pad, GstQueryType type,
-    GstFormat * format, gint64 * value);
+static GstCaps *gst_osssink_getcaps (GstBaseSink * bsink);
 
-static GstCaps *gst_osssink_sink_fixate (GstPad * pad, const GstCaps * caps);
-static GstCaps *gst_osssink_getcaps (GstPad * pad);
-static GstPadLinkReturn gst_osssink_sinkconnect (GstPad * pad,
-    const GstCaps * caps);
-
-static void gst_osssink_set_property (GObject * object, guint prop_id,
-    const GValue * value, GParamSpec * pspec);
-static void gst_osssink_get_property (GObject * object, guint prop_id,
-    GValue * value, GParamSpec * pspec);
-
-static void gst_osssink_chain (GstPad * pad, GstData * _data);
+static gboolean gst_osssink_open (GstAudioSink * asink,
+    GstRingBufferSpec * spec);
+static gboolean gst_osssink_close (GstAudioSink * asink);
+static guint gst_osssink_write (GstAudioSink * asink, gpointer data,
+    guint length);
+static guint gst_osssink_delay (GstAudioSink * asink);
+static void gst_osssink_reset (GstAudioSink * asink);
 
 /* OssSink signals and args */
 enum
 {
-  SIGNAL_HANDOFF,
   LAST_SIGNAL
 };
 
-enum
-{
-  ARG_0,
-  ARG_MUTE,
-  ARG_FRAGMENT,
-  ARG_BUFFER_SIZE,
-  ARG_SYNC,
-  ARG_CHUNK_SIZE
-      /* FILL ME */
-};
-
 static GstStaticPadTemplate osssink_sink_factory =
     GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw-int, "
-        "endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
-        "signed = (boolean) { TRUE, FALSE }, "
+        //"endianness = (int) { LITTLE_ENDIAN, BIG_ENDIAN }, "
+        //"signed = (boolean) { TRUE, FALSE }, "
+        "endianness = (int) LITTLE_ENDIAN, "
+        "signed = (boolean) TRUE, "
         "width = (int) 16, "
-        "depth = (int) { 8, 16 }, "
+        "depth = (int) 16, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, 2 ]; "
         "audio/x-raw-int, "
         "signed = (boolean) { TRUE, FALSE }, "
@@ -119,7 +82,8 @@ static GstStaticPadTemplate osssink_sink_factory =
     );
 
 static GstElementClass *parent_class = NULL;
-static guint gst_osssink_signals[LAST_SIGNAL] = { 0 };
+
+/* static guint gst_osssink_signals[LAST_SIGNAL] = { 0 }; */
 
 GType
 gst_osssink_get_type (void)
@@ -140,7 +104,7 @@ gst_osssink_get_type (void)
     };
 
     osssink_type =
-        g_type_register_static (GST_TYPE_OSSELEMENT, "GstOssSink",
+        g_type_register_static (GST_TYPE_AUDIOSINK, "GstOssSink",
         &osssink_info, 0);
   }
 
@@ -150,13 +114,6 @@ gst_osssink_get_type (void)
 static void
 gst_osssink_dispose (GObject * object)
 {
-  GstOssSink *osssink = (GstOssSink *) object;
-
-  if (osssink->provided_clock) {
-    gst_object_unparent (GST_OBJECT (osssink->provided_clock));
-    osssink->provided_clock = NULL;
-  }
-
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
@@ -166,6 +123,7 @@ gst_osssink_base_init (gpointer g_class)
   GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
 
   gst_element_class_set_details (element_class, &gst_osssink_details);
+
   gst_element_class_add_pad_template (element_class,
       gst_static_pad_template_get (&osssink_sink_factory));
 }
@@ -174,515 +132,188 @@ gst_osssink_class_init (GstOssSinkClass * klass)
 {
   GObjectClass *gobject_class;
   GstElementClass *gstelement_class;
+  GstBaseSinkClass *gstbasesink_class;
+  GstBaseAudioSinkClass *gstbaseaudiosink_class;
+  GstAudioSinkClass *gstaudiosink_class;
 
   gobject_class = (GObjectClass *) klass;
   gstelement_class = (GstElementClass *) klass;
+  gstbasesink_class = (GstBaseSinkClass *) klass;
+  gstbaseaudiosink_class = (GstBaseAudioSinkClass *) klass;
+  gstaudiosink_class = (GstAudioSinkClass *) klass;
+
+  parent_class = g_type_class_ref (GST_TYPE_BASEAUDIOSINK);
 
-  parent_class = g_type_class_ref (GST_TYPE_OSSELEMENT);
-
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_MUTE,
-      g_param_spec_boolean ("mute", "Mute", "Mute the audio",
-          FALSE, G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_SYNC,
-      g_param_spec_boolean ("sync", "Sync",
-          "If syncing on timestamps should be enabled", TRUE,
-          G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_FRAGMENT,
-      g_param_spec_int ("fragment", "Fragment",
-          "The fragment as 0xMMMMSSSS (MMMM = total fragments, 2^SSSS = fragment size)",
-          0, G_MAXINT, 6, G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_BUFFER_SIZE,
-      g_param_spec_uint ("buffer_size", "Buffer size",
-          "Size of buffers in osssink's bufferpool (bytes)", 0, G_MAXINT, 4096,
-          G_PARAM_READWRITE));
-  g_object_class_install_property (G_OBJECT_CLASS (klass), ARG_CHUNK_SIZE,
-      g_param_spec_uint ("chunk_size", "Chunk size",
-          "Write data in chunk sized buffers", 0, G_MAXUINT, 4096,
-          G_PARAM_READWRITE));
-
-  gst_osssink_signals[SIGNAL_HANDOFF] =
-      g_signal_new ("handoff", G_TYPE_FROM_CLASS (klass), G_SIGNAL_RUN_LAST,
-      G_STRUCT_OFFSET (GstOssSinkClass, handoff), NULL, NULL,
-      g_cclosure_marshal_VOID__VOID, G_TYPE_NONE, 0);
-
-  gobject_class->set_property = gst_osssink_set_property;
-  gobject_class->get_property = gst_osssink_get_property;
   gobject_class->dispose = gst_osssink_dispose;
 
-  gstelement_class->change_state = GST_DEBUG_FUNCPTR (gst_osssink_change_state);
-  gstelement_class->query = GST_DEBUG_FUNCPTR (gst_osssink_query);
-  gstelement_class->set_clock = gst_osssink_set_clock;
-  gstelement_class->get_clock = gst_osssink_get_clock;
+  gstbasesink_class->get_caps = GST_DEBUG_FUNCPTR (gst_osssink_getcaps);
 
+  gstaudiosink_class->open = GST_DEBUG_FUNCPTR (gst_osssink_open);
+  gstaudiosink_class->close = GST_DEBUG_FUNCPTR (gst_osssink_close);
+  gstaudiosink_class->write = GST_DEBUG_FUNCPTR (gst_osssink_write);
+  gstaudiosink_class->delay = GST_DEBUG_FUNCPTR (gst_osssink_delay);
+  gstaudiosink_class->reset = GST_DEBUG_FUNCPTR (gst_osssink_reset);
 }
 
 static void
 gst_osssink_init (GstOssSink * osssink)
 {
-  osssink->sinkpad =
-      gst_pad_new_from_template (gst_static_pad_template_get
-      (&osssink_sink_factory), "sink");
-  gst_element_add_pad (GST_ELEMENT (osssink), osssink->sinkpad);
-  gst_pad_set_link_function (osssink->sinkpad, gst_osssink_sinkconnect);
-  gst_pad_set_getcaps_function (osssink->sinkpad, gst_osssink_getcaps);
-  gst_pad_set_fixate_function (osssink->sinkpad, gst_osssink_sink_fixate);
-  gst_pad_set_convert_function (osssink->sinkpad, gst_osssink_convert);
-  gst_pad_set_query_function (osssink->sinkpad, gst_osssink_sink_query);
-  gst_pad_set_query_type_function (osssink->sinkpad,
-      gst_osssink_get_query_types);
-  gst_pad_set_formats_function (osssink->sinkpad, gst_osssink_get_formats);
-
-  gst_pad_set_chain_function (osssink->sinkpad, gst_osssink_chain);
-
   GST_DEBUG ("initializing osssink");
-  osssink->bufsize = 4096;
-  osssink->chunk_size = 4096;
-  osssink->mute = FALSE;
-  osssink->sync = TRUE;
-  osssink->provided_clock =
-      gst_audio_clock_new ("ossclock", gst_osssink_get_time, osssink);
-  gst_object_set_parent (GST_OBJECT (osssink->provided_clock),
-      GST_OBJECT (osssink));
-  osssink->handled = 0;
-
-  GST_FLAG_SET (osssink, GST_ELEMENT_THREAD_SUGGESTED);
-  GST_FLAG_SET (osssink, GST_ELEMENT_EVENT_AWARE);
-}
-
-static GstCaps *
-gst_osssink_sink_fixate (GstPad * pad, const GstCaps * caps)
-{
-  GstCaps *newcaps;
-  GstStructure *structure;
 
-  newcaps =
-      gst_caps_new_full (gst_structure_copy (gst_caps_get_structure (caps, 0)),
-      NULL);
-  structure = gst_caps_get_structure (newcaps, 0);
-
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "rate", 44100)) {
-    return newcaps;
-  }
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "depth", 16)) {
-    return newcaps;
-  }
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "width", 16)) {
-    return newcaps;
-  }
-  if (gst_caps_structure_fixate_field_nearest_int (structure, "channels", 2)) {
-    return newcaps;
-  }
-
-  gst_caps_free (newcaps);
-
-  return NULL;
+  osssink->element = g_object_new (GST_TYPE_OSSELEMENT, NULL);
 }
 
 static GstCaps *
-gst_osssink_getcaps (GstPad * pad)
+gst_osssink_getcaps (GstBaseSink * bsink)
 {
-  GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad));
+  GstOssSink *osssink;
+  GstOssElement *element;
   GstCaps *caps;
 
-  gst_osselement_probe_caps (GST_OSSELEMENT (osssink));
+  osssink = GST_OSSSINK (bsink);
+  element = osssink->element;
+
+  gst_osselement_probe_caps (element);
 
-  if (GST_OSSELEMENT (osssink)->probed_caps == NULL) {
-    caps = gst_caps_copy (gst_pad_get_pad_template_caps (pad));
+  if (element->probed_caps == NULL) {
+    caps =
+        gst_caps_copy (gst_pad_get_pad_template_caps (GST_BASESINK_PAD
+            (bsink)));
   } else {
-    caps = gst_caps_copy (GST_OSSELEMENT (osssink)->probed_caps);
+    caps = gst_caps_ref (element->probed_caps);
   }
 
   return caps;
 }
 
-static GstPadLinkReturn
-gst_osssink_sinkconnect (GstPad * pad, const GstCaps * caps)
-{
-  GstOssSink *osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
-  if (!gst_osselement_parse_caps (GST_OSSELEMENT (osssink), caps))
-    return GST_PAD_LINK_REFUSED;
-
-  if (!gst_osselement_sync_parms (GST_OSSELEMENT (osssink))) {
-    return GST_PAD_LINK_REFUSED;
-  }
-
-  return GST_PAD_LINK_OK;
-}
-
-static inline gint
-gst_osssink_get_delay (GstOssSink * osssink)
-{
-  gint delay = 0;
-  gint ret;
-
-  if (GST_OSSELEMENT (osssink)->fd == -1)
-    return 0;
-
-#ifdef SNDCTL_DSP_GETODELAY
-  ret = ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETODELAY, &delay);
-#else
-  ret = -1;
-#endif
-  if (ret < 0) {
-    audio_buf_info info;
-
-    if (ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_GETOSPACE, &info) < 0) {
-      delay = 0;
-    } else {
-      delay = (info.fragstotal * info.fragsize) - info.bytes;
-    }
-  }
-
-  return delay;
-}
-
-static GstClockTime
-gst_osssink_get_time (GstClock * clock, gpointer data)
+static gint
+ilog2 (gint x)
 {
-  GstOssSink *osssink = GST_OSSSINK (data);
-  gint delay;
-  GstClockTime res;
-
-  if (!GST_OSSELEMENT (osssink)->bps)
-    return 0;
-
-  delay = gst_osssink_get_delay (osssink);
-
-  /* sometimes delay is bigger than the number of bytes sent to the device,
-   * which screws up this calculation, we assume that everything is still
-   * in the device then
-   * thomas: with proper handling of the return value, this doesn't seem to
-   * happen anymore, so remove the second code path after april 2004 */
-  if (delay > (gint64) osssink->handled) {
-    /*g_warning ("Delay %d > osssink->handled %" G_GUINT64_FORMAT
-       ", setting to osssink->handled",
-       delay, osssink->handled); */
-    delay = osssink->handled;
-  }
-  res =
-      ((gint64) osssink->handled -
-      delay) * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
-  if (res < 0)
-    res = 0;
-
-  return res;
+  /* well... hacker's delight explains... */
+  x = x | (x >> 1);
+  x = x | (x >> 2);
+  x = x | (x >> 4);
+  x = x | (x >> 8);
+  x = x | (x >> 16);
+  x = x - ((x >> 1) & 0x55555555);
+  x = (x & 0x33333333) + ((x >> 2) & 0x33333333);
+  x = (x + (x >> 4)) & 0x0f0f0f0f;
+  x = x + (x >> 8);
+  x = x + (x >> 16);
+  return (x & 0x0000003f) - 1;
 }
 
-static GstClock *
-gst_osssink_get_clock (GstElement * element)
-{
-  GstOssSink *osssink;
-
-  osssink = GST_OSSSINK (element);
+#define SET_PARAM(_oss, _name, _val) 		\
+G_STMT_START {					\
+  int _tmp = _val;				\
+  if (ioctl(_oss->fd, _name, &_tmp) == -1) {	\
+    perror(G_STRINGIFY (_name));		\
+    return FALSE;				\
+  }						\
+  GST_DEBUG(G_STRINGIFY (name) " %d", _tmp);	\
+} G_STMT_END
+
+#define GET_PARAM(oss, name, val) 		\
+G_STMT_START {					\
+  if (ioctl(oss->fd, name, val) == -1) {	\
+    perror(G_STRINGIFY (name));			\
+    return FALSE;				\
+  }						\
+} G_STMT_END
 
-  return GST_CLOCK (osssink->provided_clock);
-}
-
-static void
-gst_osssink_set_clock (GstElement * element, GstClock * clock)
+static gboolean
+gst_osssink_open (GstAudioSink * asink, GstRingBufferSpec * spec)
 {
-  GstOssSink *osssink;
+  struct audio_buf_info info;
+  int mode;
+  GstOssSink *oss;
+  int tmp;
 
-  osssink = GST_OSSSINK (element);
+  oss = GST_OSSSINK (asink);
 
-  osssink->clock = clock;
-}
+  mode = O_WRONLY;
+  mode |= O_NONBLOCK;
 
-static void
-gst_osssink_chain (GstPad * pad, GstData * _data)
-{
-  GstBuffer *buf = GST_BUFFER (_data);
-  GstOssSink *osssink;
-  GstClockTimeDiff buftime, soundtime, elementtime;
-  guchar *data;
-  guint to_write;
-  gint delay;
-
-  /* this has to be an audio buffer */
-  osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
-  if (GST_IS_EVENT (buf)) {
-    GstEvent *event = GST_EVENT (buf);
-
-    switch (GST_EVENT_TYPE (event)) {
-      case GST_EVENT_EOS:
-        ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_SYNC, 0);
-        gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
-            FALSE);
-        gst_pad_event_default (pad, event);
-        return;
-      default:
-        gst_pad_event_default (pad, event);
-        return;
-    }
-    g_assert_not_reached ();
+  oss->fd = open ("/dev/dsp", mode, 0);
+  if (oss->fd == -1) {
+    perror ("/dev/dsp");
+    return FALSE;
   }
+  mode = fcntl (oss->fd, F_GETFL);
+  mode &= ~O_NONBLOCK;
+  fcntl (oss->fd, F_SETFL, mode);
 
-  if (!GST_OSSELEMENT (osssink)->bps) {
-    gst_buffer_unref (buf);
-    GST_ELEMENT_ERROR (osssink, CORE, NEGOTIATION, (NULL),
-        ("format wasn't negotiated before chain function"));
-    return;
-  }
+  SET_PARAM (oss, SNDCTL_DSP_SETFMT, AFMT_S16_LE);
+  SET_PARAM (oss, SNDCTL_DSP_STEREO, 1);
+  SET_PARAM (oss, SNDCTL_DSP_CHANNELS, 2);
+  SET_PARAM (oss, SNDCTL_DSP_SPEED, 44100);
 
-  data = GST_BUFFER_DATA (buf);
-  to_write = GST_BUFFER_SIZE (buf);
-  /* sync audio with buffers timestamp. elementtime is the *current* time.
-   * soundtime is the time if the soundcard has processed all queued data. */
-  elementtime = gst_element_get_time (GST_ELEMENT (osssink));
-  delay = gst_osssink_get_delay (osssink);
-  if (delay < 0)
-    delay = 0;
-  soundtime = elementtime + delay * GST_SECOND / GST_OSSELEMENT (osssink)->bps;
-  if (GST_BUFFER_TIMESTAMP_IS_VALID (buf)) {
-    buftime = GST_BUFFER_TIMESTAMP (buf);
-  } else {
-    buftime = soundtime;
-  }
-  GST_LOG_OBJECT (osssink,
-      "time: real %" GST_TIME_FORMAT ", buffer: %" GST_TIME_FORMAT,
-      GST_TIME_ARGS (soundtime), GST_TIME_ARGS (buftime));
-  if (MAX (buftime, soundtime) - MIN (buftime, soundtime) > (GST_SECOND / 10)) {
-    /* we need to adjust to the buffers here */
-    GST_INFO_OBJECT (osssink,
-        "need sync: real %" GST_TIME_FORMAT ", buffer: %" GST_TIME_FORMAT,
-        GST_TIME_ARGS (soundtime), GST_TIME_ARGS (buftime));
-    if (soundtime > buftime) {
-      /* do *not* throw frames out. It's useless. The next frame will come in
-       * too late. And the next one. And so on. We don't want to lose sound.
-       * This is a placeholder for what - some day - should become QoS, i.e.
-       * sending events upstream to drop buffers. */
-    } else {
-      guint64 to_handle =
-          (((buftime -
-                  soundtime) * GST_OSSELEMENT (osssink)->bps / GST_SECOND) /
-          ((GST_OSSELEMENT (osssink)->width / 8) *
-              GST_OSSELEMENT (osssink)->channels)) *
-          (GST_OSSELEMENT (osssink)->width / 8) *
-          GST_OSSELEMENT (osssink)->channels;
-      guint8 *sbuf = g_new (guint8, to_handle);
-
-      memset (sbuf, (GST_OSSELEMENT (osssink)->width == 8) ? 0 : 128,
-          to_handle);
-      while (to_handle > 0) {
-        gint done = write (GST_OSSELEMENT (osssink)->fd, sbuf,
-            MIN (to_handle, osssink->chunk_size));
-
-        if (done == -1 && errno != EINTR) {
-          break;
-        } else {
-          to_handle -= done;
-          osssink->handled += done;
-        }
-      }
-      g_free (sbuf);
-    }
-  }
+  tmp = ilog2 (spec->segsize);
+  tmp = ((spec->segtotal & 0x7fff) << 16) | tmp;
+  GST_DEBUG ("set segsize: %d, segtotal: %d, value: %08x", spec->segsize,
+      spec->segtotal, tmp);
 
-  if (GST_OSSELEMENT (osssink)->fd >= 0 && to_write > 0) {
-    if (!osssink->mute) {
-
-      while (to_write > 0) {
-        gint done = write (GST_OSSELEMENT (osssink)->fd, data,
-            MIN (to_write, osssink->chunk_size));
-
-        if (done == -1) {
-          if (errno != EINTR)
-            break;
-        } else {
-          to_write -= done;
-          data += done;
-          osssink->handled += done;
-        }
-      }
-    } else {
-      g_warning ("muting osssinks unimplemented wrt clocks!");
-    }
-  }
+  SET_PARAM (oss, SNDCTL_DSP_SETFRAGMENT, tmp);
+  GET_PARAM (oss, SNDCTL_DSP_GETOSPACE, &info);
 
-  gst_audio_clock_update_time ((GstAudioClock *) osssink->provided_clock,
-      gst_osssink_get_time (osssink->provided_clock, osssink));
+  spec->segsize = info.fragsize;
+  spec->segtotal = info.fragstotal;
+  spec->bytes_per_sample = 4;
+  oss->bytes_per_sample = 4;
+  memset (spec->silence_sample, 0, spec->bytes_per_sample);
 
-  gst_buffer_unref (buf);
-}
+  GST_DEBUG ("got segsize: %d, segtotal: %d, value: %08x", spec->segsize,
+      spec->segtotal, tmp);
 
-static const GstFormat *
-gst_osssink_get_formats (GstPad * pad)
-{
-  static const GstFormat formats[] = {
-    GST_FORMAT_TIME,
-    GST_FORMAT_DEFAULT,
-    GST_FORMAT_BYTES,
-    0
-  };
-
-  return formats;
+  return TRUE;
 }
 
 static gboolean
-gst_osssink_convert (GstPad * pad, GstFormat src_format, gint64 src_value,
-    GstFormat * dest_format, gint64 * dest_value)
+gst_osssink_close (GstAudioSink * asink)
 {
-  GstOssSink *osssink;
-
-  osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
-  return gst_osselement_convert (GST_OSSELEMENT (osssink),
-      src_format, src_value, dest_format, dest_value);
+  close (GST_OSSSINK (asink)->fd);
+  return TRUE;
 }
 
-static const GstQueryType *
-gst_osssink_get_query_types (GstPad * pad)
+static guint
+gst_osssink_write (GstAudioSink * asink, gpointer data, guint length)
 {
-  static const GstQueryType query_types[] = {
-    GST_QUERY_LATENCY,
-    GST_QUERY_POSITION,
-    0,
-  };
-
-  return query_types;
+  return write (GST_OSSSINK (asink)->fd, data, length);
 }
 
-static gboolean
-gst_osssink_sink_query (GstPad * pad, GstQueryType type, GstFormat * format,
-    gint64 * value)
+static guint
+gst_osssink_delay (GstAudioSink * asink)
 {
-  gboolean res = TRUE;
-  GstOssSink *osssink;
-
-  osssink = GST_OSSSINK (gst_pad_get_parent (pad));
-
-  switch (type) {
-    case GST_QUERY_LATENCY:
-      if (!gst_osssink_convert (pad,
-              GST_FORMAT_BYTES, gst_osssink_get_delay (osssink),
-              format, value)) {
-        res = FALSE;
-      }
-      break;
-    case GST_QUERY_POSITION:
-      if (!gst_osssink_convert (pad,
-              GST_FORMAT_TIME, gst_element_get_time (GST_ELEMENT (osssink)),
-              format, value)) {
-        res = FALSE;
-      }
-      break;
-    default:
-      res =
-          gst_pad_query (gst_pad_get_peer (osssink->sinkpad), type, format,
-          value);
-      break;
-  }
-
-  return res;
-}
+  GstOssSink *oss;
+  gint delay = 0;
+  gint ret;
 
-static gboolean
-gst_osssink_query (GstElement * element, GstQueryType type, GstFormat * format,
-    gint64 * value)
-{
-  GstOssSink *osssink = GST_OSSSINK (element);
+  oss = GST_OSSSINK (asink);
 
-  return gst_osssink_sink_query (osssink->sinkpad, type, format, value);
-}
+#ifdef SNDCTL_DSP_GETODELAY
+  ret = ioctl (oss->fd, SNDCTL_DSP_GETODELAY, &delay);
+#else
+  ret = -1;
+#endif
+  if (ret < 0) {
+    audio_buf_info info;
 
-static void
-gst_osssink_set_property (GObject * object, guint prop_id, const GValue * value,
-    GParamSpec * pspec)
-{
-  GstOssSink *osssink;
+    ret = ioctl (oss->fd, SNDCTL_DSP_GETOSPACE, &info);
 
-  osssink = GST_OSSSINK (object);
-
-  switch (prop_id) {
-    case ARG_MUTE:
-      osssink->mute = g_value_get_boolean (value);
-      g_object_notify (G_OBJECT (osssink), "mute");
-      break;
-    case ARG_FRAGMENT:
-      GST_OSSELEMENT (osssink)->fragment = g_value_get_int (value);
-      gst_osselement_sync_parms (GST_OSSELEMENT (osssink));
-      break;
-    case ARG_BUFFER_SIZE:
-      osssink->bufsize = g_value_get_uint (value);
-      g_object_notify (object, "buffer_size");
-      break;
-    case ARG_SYNC:
-      osssink->sync = g_value_get_boolean (value);
-      g_object_notify (G_OBJECT (osssink), "sync");
-      break;
-    case ARG_CHUNK_SIZE:
-      osssink->chunk_size = g_value_get_uint (value);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
+    delay = (ret < 0 ? 0 : (info.fragstotal * info.fragsize) - info.bytes);
   }
+  return delay / oss->bytes_per_sample;
 }
 
 static void
-gst_osssink_get_property (GObject * object, guint prop_id, GValue * value,
-    GParamSpec * pspec)
+gst_osssink_reset (GstAudioSink * asink)
 {
-  GstOssSink *osssink;
+  GstOssSink *oss;
 
-  osssink = GST_OSSSINK (object);
-
-  switch (prop_id) {
-    case ARG_MUTE:
-      g_value_set_boolean (value, osssink->mute);
-      break;
-    case ARG_FRAGMENT:
-      g_value_set_int (value, GST_OSSELEMENT (osssink)->fragment);
-      break;
-    case ARG_BUFFER_SIZE:
-      g_value_set_uint (value, osssink->bufsize);
-      break;
-    case ARG_SYNC:
-      g_value_set_boolean (value, osssink->sync);
-      break;
-    case ARG_CHUNK_SIZE:
-      g_value_set_uint (value, osssink->chunk_size);
-      break;
-    default:
-      G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
-      break;
-  }
-}
-
-static GstElementStateReturn
-gst_osssink_change_state (GstElement * element)
-{
-  GstOssSink *osssink;
-
-  osssink = GST_OSSSINK (element);
-
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
-      break;
-    case GST_STATE_PAUSED_TO_PLAYING:
-      gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
-          TRUE);
-      break;
-    case GST_STATE_PLAYING_TO_PAUSED:
-      if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
-        ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
-      gst_audio_clock_set_active (GST_AUDIO_CLOCK (osssink->provided_clock),
-          FALSE);
-      break;
-    case GST_STATE_PAUSED_TO_READY:
-      if (GST_FLAG_IS_SET (element, GST_OSSSINK_OPEN))
-        ioctl (GST_OSSELEMENT (osssink)->fd, SNDCTL_DSP_RESET, 0);
-      gst_osselement_reset (GST_OSSELEMENT (osssink));
-      osssink->handled = 0;
-      break;
-    default:
-      break;
-  }
+  //gint ret;
 
-  if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  oss = GST_OSSSINK (asink);
 
-  return GST_STATE_SUCCESS;
+  /* deadlocks on my machine... */
+  //ret = ioctl (oss->fd, SNDCTL_DSP_RESET, 0);
 }