diff options
| author | Michal Ratajsky <[email protected]> | 2014-11-08 22:18:34 +0100 |
|---|---|---|
| committer | Michal Ratajsky <[email protected]> | 2014-11-08 22:18:34 +0100 |
| commit | 068d95e1c28b0e20e692c5ecb24f044542e82ae9 (patch) | |
| tree | 5be0c066ba9d6ce605c4b82e8e0ae2ec8c00bb9c /backends/alsa/alsa-switch.h | |
| parent | e72c6f834323e65a41f2ab50047d6fd98f1e09db (diff) | |
| download | libmatemixer-068d95e1c28b0e20e692c5ecb24f044542e82ae9.tar.bz2 libmatemixer-068d95e1c28b0e20e692c5ecb24f044542e82ae9.tar.xz | |
alsa: Use MateMixerStreamSwitch
Also introduce alsa-types.h and move instance typedefs there to fix cross referencing introduced by this change
Diffstat (limited to 'backends/alsa/alsa-switch.h')
| -rw-r--r-- | backends/alsa/alsa-switch.h | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/backends/alsa/alsa-switch.h b/backends/alsa/alsa-switch.h index b7f5931..9ebf907 100644 --- a/backends/alsa/alsa-switch.h +++ b/backends/alsa/alsa-switch.h @@ -22,6 +22,8 @@ #include <glib-object.h> #include <libmatemixer/matemixer.h> +#include "alsa-types.h" + G_BEGIN_DECLS #define ALSA_TYPE_SWITCH \ @@ -37,13 +39,12 @@ G_BEGIN_DECLS #define ALSA_SWITCH_GET_CLASS(o) \ (G_TYPE_INSTANCE_GET_CLASS ((o), ALSA_TYPE_SWITCH, AlsaSwitchClass)) -typedef struct _AlsaSwitch AlsaSwitch; typedef struct _AlsaSwitchClass AlsaSwitchClass; typedef struct _AlsaSwitchPrivate AlsaSwitchPrivate; struct _AlsaSwitch { - MateMixerSwitch parent; + MateMixerStreamSwitch parent; /*< private >*/ AlsaSwitchPrivate *priv; @@ -51,12 +52,13 @@ struct _AlsaSwitch struct _AlsaSwitchClass { - MateMixerSwitchClass parent_class; + MateMixerStreamSwitchClass parent_class; }; GType alsa_switch_get_type (void) G_GNUC_CONST; -AlsaSwitch *alsa_switch_new (const gchar *name, +AlsaSwitch *alsa_switch_new (AlsaStream *stream, + const gchar *name, const gchar *label, MateMixerSwitchRole role, GList *options); |