sys/oss/: Port from THREADED+wim's fixes.

Original commit message from CVS:
2005-07-08  Andy Wingo  <wingo@pobox.com>

* sys/oss/: Port from THREADED+wim's fixes.

1 files changed, 11 insertions, 31 deletions

diff --git a/sys/oss/gstosssink.h b/sys/oss/gstosssink.h
index 7542c8d1..964794c8 100644
--- a/sys/oss/gstosssink.h
+++ b/sys/oss/gstosssink.h
@@ -26,52 +26,32 @@
 
 
 #include <gst/gst.h>
+#include <gst/audio/gstaudiosink.h>
 
 #include "gstosselement.h"
-#include <gst/audio/audioclock.h>
 
 G_BEGIN_DECLS
 
-#define GST_TYPE_OSSSINK \
-  (gst_osssink_get_type())
-#define GST_OSSSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSSSINK,GstOssSink))
-#define GST_OSSSINK_CLASS(klass) \
-  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSSSINK,GstOssSinkClass))
-#define GST_IS_OSSSINK(obj) \
-  (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSSSINK))
-#define GST_IS_OSSSINK_CLASS(obj) \
-  (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSSSINK))
-
-typedef enum {
-  GST_OSSSINK_OPEN		= GST_ELEMENT_FLAG_LAST,
-
-  GST_OSSSINK_FLAG_LAST	= GST_ELEMENT_FLAG_LAST+2,
-} GstOssSinkFlags;
+#define GST_TYPE_OSSSINK          (gst_osssink_get_type())
+#define GST_OSSSINK(obj)          (G_TYPE_CHECK_INSTANCE_CAST((obj),GST_TYPE_OSSSINK,GstOssSink))
+#define GST_OSSSINK_CLASS(klass)  (G_TYPE_CHECK_CLASS_CAST((klass),GST_TYPE_OSSSINK,GstOssSinkClass))
+#define GST_IS_OSSSINK(obj)       (G_TYPE_CHECK_INSTANCE_TYPE((obj),GST_TYPE_OSSSINK))
+#define GST_IS_OSSSINK_CLASS(obj) (G_TYPE_CHECK_CLASS_TYPE((klass),GST_TYPE_OSSSINK))
 
 typedef struct _GstOssSink GstOssSink;
 typedef struct _GstOssSinkClass GstOssSinkClass;
 
 struct _GstOssSink {
-  GstOssElement	 element;
+  GstAudioSink    sink;
 
-  GstPad 	*sinkpad;
+  GstOssElement *element;
 
-  GstClock 	*provided_clock;
-  GstClock 	*clock;
-  gboolean	 sync;
-  guint64	 handled;
-
-  gboolean 	 mute;
-  guint 	 bufsize;
-  guint 	 chunk_size;
+  gint fd;
+  gint		 bytes_per_sample;
 };
 
 struct _GstOssSinkClass {
-  GstOssElementClass parent_class;
-
-  /* signals */
-  void (*handoff) (GstElement *element,GstPad *pad);
+  GstAudioSinkClass parent_class;
 };
 
 GType gst_osssink_get_type(void);