Add ALSA, improve OSS and remove OSS4

1 files changed, 16 insertions, 12 deletions

diff --git a/backends/oss/oss-device.h b/backends/oss/oss-device.h
index fe40eb2..261a884 100644
--- a/backends/oss/oss-device.h
+++ b/backends/oss/oss-device.h
@@ -20,6 +20,9 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <libmatemixer/matemixer.h>
+
+#include "oss-stream.h"
 
 G_BEGIN_DECLS
 
@@ -42,7 +45,7 @@ typedef struct _OssDevicePrivate  OssDevicePrivate;
 
 struct _OssDevice
 {
-    GObject parent;
+    MateMixerDevice parent;
 
     /*< private >*/
     OssDevicePrivate *priv;
@@ -50,23 +53,24 @@ struct _OssDevice
 
 struct _OssDeviceClass
 {
-    GObjectClass parent;
+    MateMixerDeviceClass parent;
 };
 
-GType            oss_device_get_type          (void) G_GNUC_CONST;
-
-OssDevice *      oss_device_new               (const gchar *path,
-                                               gint         fd);
+GType        oss_device_get_type          (void) G_GNUC_CONST;
 
-gboolean         oss_device_read              (OssDevice   *device);
+OssDevice *  oss_device_new               (const gchar *name,
+                                           const gchar *label,
+                                           const gchar *path,
+                                           gint         fd);
 
-const gchar *    oss_device_get_path          (OssDevice   *odevice);
+gboolean     oss_device_open              (OssDevice   *device);
+gboolean     oss_device_load              (OssDevice   *device);
 
-MateMixerStream *oss_device_get_input_stream  (OssDevice   *odevice);
-MateMixerStream *oss_device_get_output_stream (OssDevice   *odevice);
+gint         oss_device_get_fd            (OssDevice   *device);
+const gchar *oss_device_get_path          (OssDevice   *device);
 
-gboolean         oss_device_set_description   (OssDevice   *odevice,
-                                               const gchar *description);
+OssStream *  oss_device_get_input_stream  (OssDevice   *device);
+OssStream *  oss_device_get_output_stream (OssDevice   *device);
 
 G_END_DECLS