diff options
| author | Stefano Karapetsas <[email protected]> | 2014-10-09 15:59:09 +0200 |
|---|---|---|
| committer | Stefano Karapetsas <[email protected]> | 2014-10-09 15:59:09 +0200 |
| commit | 526fdf477edc40452c18b51e13cbdffaa69de52b (patch) | |
| tree | dd73763b097fca2a86288bcb55881a96f3e5faaf /backends/alsa | |
| parent | b4695e82ae0cc3183e9d3be4fca191394292609f (diff) | |
| parent | 0ab66491e3847f6de92fc5358e9687c6d2f458ce (diff) | |
| download | libmatemixer-526fdf477edc40452c18b51e13cbdffaa69de52b.tar.bz2 libmatemixer-526fdf477edc40452c18b51e13cbdffaa69de52b.tar.xz | |
Merge branch 'after-gsoc'
Diffstat (limited to 'backends/alsa')
| -rw-r--r-- | backends/alsa/alsa-backend.c | 20 | ||||
| -rw-r--r-- | backends/alsa/alsa-device.c | 2 | ||||
| -rw-r--r-- | backends/alsa/alsa-stream-control.c | 2 | ||||
| -rw-r--r-- | backends/alsa/alsa-toggle.c | 4 |
4 files changed, 15 insertions, 13 deletions
diff --git a/backends/alsa/alsa-backend.c b/backends/alsa/alsa-backend.c index 6bac691..0b7895e 100644 --- a/backends/alsa/alsa-backend.c +++ b/backends/alsa/alsa-backend.c @@ -28,6 +28,7 @@ #define BACKEND_NAME "ALSA" #define BACKEND_PRIORITY 20 +#define BACKEND_FLAGS MATE_MIXER_BACKEND_NO_FLAGS #define ALSA_DEVICE_GET_ID(d) \ (g_object_get_data (G_OBJECT (d), "__matemixer_alsa_device_id")) @@ -97,10 +98,11 @@ backend_module_init (GTypeModule *module) { alsa_backend_register_type (module); - info.name = BACKEND_NAME; - info.priority = BACKEND_PRIORITY; - info.g_type = ALSA_TYPE_BACKEND; - info.backend_type = MATE_MIXER_BACKEND_ALSA; + info.name = BACKEND_NAME; + info.priority = BACKEND_PRIORITY; + info.g_type = ALSA_TYPE_BACKEND; + info.backend_flags = BACKEND_FLAGS; + info.backend_type = MATE_MIXER_BACKEND_ALSA; } const MateMixerBackendInfo *backend_module_get_info (void) @@ -363,10 +365,12 @@ read_device (AlsaBackend *alsa, const gchar *card) static void add_device (AlsaBackend *alsa, AlsaDevice *device) { - alsa->priv->devices = g_list_insert_sorted_with_data (alsa->priv->devices, - device, - (GCompareDataFunc) compare_devices, - NULL); + /* Takes reference of device */ + alsa->priv->devices = + g_list_insert_sorted_with_data (alsa->priv->devices, + device, + (GCompareDataFunc) compare_devices, + NULL); /* Keep track of device identifiers */ g_hash_table_add (alsa->priv->devices_ids, g_strdup (ALSA_DEVICE_GET_ID (device))); diff --git a/backends/alsa/alsa-device.c b/backends/alsa/alsa-device.c index f7f705e..03dd7c0 100644 --- a/backends/alsa/alsa-device.c +++ b/backends/alsa/alsa-device.c @@ -230,7 +230,7 @@ alsa_device_finalize (GObject *object) close_mixer (device); - G_OBJECT_CLASS (alsa_device_parent_class)->dispose (object); + G_OBJECT_CLASS (alsa_device_parent_class)->finalize (object); } AlsaDevice * diff --git a/backends/alsa/alsa-stream-control.c b/backends/alsa/alsa-stream-control.c index 97a0f8b..b5500d1 100644 --- a/backends/alsa/alsa-stream-control.c +++ b/backends/alsa/alsa-stream-control.c @@ -291,8 +291,6 @@ alsa_stream_control_set_mute (MateMixerStreamControl *mmsc, gboolean mute) for (i = 0; i < control->priv->data.channels; i++) control->priv->data.m[i] = mute; - - _mate_mixer_stream_control_set_mute (mmsc, mute); } return TRUE; } diff --git a/backends/alsa/alsa-toggle.c b/backends/alsa/alsa-toggle.c index a7958c9..c843985 100644 --- a/backends/alsa/alsa-toggle.c +++ b/backends/alsa/alsa-toggle.c @@ -92,8 +92,8 @@ alsa_toggle_new (const gchar *name, "label", label, "flags", MATE_MIXER_SWITCH_TOGGLE, "role", role, - "state-option-on", on, - "state-option-off", off, + "on-state-option", on, + "off-state-option", off, NULL); toggle->priv->type = type; |