Global update

1 files changed, 21 insertions, 12 deletions

diff --git a/backends/pulse/pulse-device.h b/backends/pulse/pulse-device.h
index 94c331f..863330f 100644
--- a/backends/pulse/pulse-device.h
+++ b/backends/pulse/pulse-device.h
@@ -20,33 +20,33 @@
 
 #include <glib.h>
 #include <glib-object.h>
+#include <libmatemixer/matemixer.h>
 
 #include <pulse/pulseaudio.h>
 
-#include "pulse-connection.h"
+#include "pulse-types.h"
 
 G_BEGIN_DECLS
 
-#define PULSE_TYPE_DEVICE            \
+#define PULSE_TYPE_DEVICE                       \
         (pulse_device_get_type ())
-#define PULSE_DEVICE(o)              \
+#define PULSE_DEVICE(o)                         \
         (G_TYPE_CHECK_INSTANCE_CAST ((o), PULSE_TYPE_DEVICE, PulseDevice))
-#define PULSE_IS_DEVICE(o)           \
+#define PULSE_IS_DEVICE(o)                      \
         (G_TYPE_CHECK_INSTANCE_TYPE ((o), PULSE_TYPE_DEVICE))
-#define PULSE_DEVICE_CLASS(k)        \
+#define PULSE_DEVICE_CLASS(k)                   \
         (G_TYPE_CHECK_CLASS_CAST ((k), PULSE_TYPE_DEVICE, PulseDeviceClass))
-#define PULSE_IS_DEVICE_CLASS(k)     \
+#define PULSE_IS_DEVICE_CLASS(k)                \
         (G_TYPE_CHECK_CLASS_TYPE ((k), PULSE_TYPE_DEVICE))
-#define PULSE_DEVICE_GET_CLASS(o)    \
+#define PULSE_DEVICE_GET_CLASS(o)               \
         (G_TYPE_INSTANCE_GET_CLASS ((o), PULSE_IS_DEVICE, PulseDeviceClass))
 
-typedef struct _PulseDevice         PulseDevice;
 typedef struct _PulseDeviceClass    PulseDeviceClass;
 typedef struct _PulseDevicePrivate  PulseDevicePrivate;
 
 struct _PulseDevice
 {
-    GObject parent;
+    MateMixerDevice parent;
 
     /*< private >*/
     PulseDevicePrivate *priv;
@@ -54,20 +54,29 @@ struct _PulseDevice
 
 struct _PulseDeviceClass
 {
-    GObjectClass parent;
+    MateMixerDeviceClass parent;
 };
 
 GType            pulse_device_get_type       (void) G_GNUC_CONST;
 
-PulseDevice     *pulse_device_new            (PulseConnection    *connection,
+PulseDevice *    pulse_device_new            (PulseConnection    *connection,
                                               const pa_card_info *info);
 
-gboolean         pulse_device_update         (PulseDevice        *device,
+void             pulse_device_update         (PulseDevice        *device,
                                               const pa_card_info *info);
 
+void             pulse_device_add_stream     (PulseDevice        *device,
+                                              PulseStream        *stream);
+
+void             pulse_device_remove_stream  (PulseDevice        *device,
+                                              PulseStream        *stream);
+
 guint32          pulse_device_get_index      (PulseDevice        *device);
 PulseConnection *pulse_device_get_connection (PulseDevice        *device);
 
+PulsePort *      pulse_device_get_port       (PulseDevice        *device,
+                                              const gchar        *name);
+
 G_END_DECLS
 
 #endif /* PULSE_DEVICE_H */