summaryrefslogtreecommitdiff
path: root/backends/oss/oss-stream.h
diff options
context:
space:
mode:
authorMichal Ratajsky <[email protected]>2014-08-12 04:56:55 +0200
committerMichal Ratajsky <[email protected]>2014-08-12 04:56:55 +0200
commit6c6d4239ddc807e922df3874654f99eea291aadb (patch)
tree558f48fc965476344a946d93088680db3b5bac41 /backends/oss/oss-stream.h
parent8436ec1641eee8868128755f6d1475230cea25e6 (diff)
downloadlibmatemixer-6c6d4239ddc807e922df3874654f99eea291aadb.tar.bz2
libmatemixer-6c6d4239ddc807e922df3874654f99eea291aadb.tar.xz
Add ALSA, improve OSS and remove OSS4
Diffstat (limited to 'backends/oss/oss-stream.h')
-rw-r--r--backends/oss/oss-stream.h25
1 files changed, 12 insertions, 13 deletions
diff --git a/backends/oss/oss-stream.h b/backends/oss/oss-stream.h
index d6c2fb2..0470eb7 100644
--- a/backends/oss/oss-stream.h
+++ b/backends/oss/oss-stream.h
@@ -20,7 +20,9 @@
#include <glib.h>
#include <glib-object.h>
+#include <libmatemixer/matemixer.h>
+#include "oss-device.h"
#include "oss-stream-control.h"
G_BEGIN_DECLS
@@ -44,7 +46,7 @@ typedef struct _OssStreamPrivate OssStreamPrivate;
struct _OssStream
{
- GObject parent;
+ MateMixerStream parent;
/*< private >*/
OssStreamPrivate *priv;
@@ -52,23 +54,20 @@ struct _OssStream
struct _OssStreamClass
{
- GObjectClass parent;
+ MateMixerStreamClass parent;
};
-GType oss_stream_get_type (void) G_GNUC_CONST;
+GType oss_stream_get_type (void) G_GNUC_CONST;
-OssStream * oss_stream_new (const gchar *name,
- const gchar *description,
- MateMixerStreamFlags flags);
+OssStream *oss_stream_new (const gchar *name,
+ MateMixerDevice *device,
+ MateMixerStreamFlags flags);
-gboolean oss_stream_add_control (OssStream *stream,
- OssStreamControl *ctl);
+gboolean oss_stream_add_control (OssStream *stream,
+ OssStreamControl *control);
-gboolean oss_stream_set_default_control (OssStream *stream,
- OssStreamControl *ctl);
-
-gboolean oss_stream_add_port (OssStream *ostream,
- MateMixerPort *port);
+gboolean oss_stream_set_default_control (OssStream *stream,
+ OssStreamControl *control);
G_END_DECLS