From c161115288901b521c0465685d0ea3c307da763d Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Thu, 1 Apr 2010 11:17:52 +0300 Subject: stream-restore: Fix segfaulting. The dbus entry callbacks expect a dbus_entry pointer instead of a userdata pointer. --- src/modules/module-stream-restore.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/modules/module-stream-restore.c') diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index c16a74c3..d7852d04 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -310,7 +310,7 @@ static struct dbus_entry *dbus_entry_new(struct userdata *u, const char *entry_n de->index = u->next_index++; de->object_path = pa_sprintf_malloc("%s/%s%u", OBJECT_PATH, ENTRY_OBJECT_NAME, de->index); - pa_assert_se(pa_dbus_protocol_add_interface(u->dbus_protocol, de->object_path, &entry_interface_info, u) >= 0); + pa_assert_se(pa_dbus_protocol_add_interface(u->dbus_protocol, de->object_path, &entry_interface_info, de) >= 0); return de; } -- cgit From 71ef5fe7e84702ca6a2869702ad4c5a15c9c2f9b Mon Sep 17 00:00:00 2001 From: Tanu Kaskinen Date: Thu, 15 Apr 2010 13:11:57 +0300 Subject: stream-restore: When changing restore entries with D-Bus, apply the changes immediately. --- src/modules/module-stream-restore.c | 3 +++ 1 file changed, 3 insertions(+) (limited to 'src/modules/module-stream-restore.c') diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index d7852d04..346b6ad1 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -765,6 +765,7 @@ static void handle_entry_set_device(DBusConnection *conn, DBusMessage *msg, DBus value.size = sizeof(struct entry); pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0); + apply_entry(de->userdata, de->entry_name, e); send_device_updated_signal(de, e); trigger_save(de->userdata); } @@ -829,6 +830,7 @@ static void handle_entry_set_volume(DBusConnection *conn, DBusMessage *msg, DBus value.size = sizeof(struct entry); pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0); + apply_entry(de->userdata, de->entry_name, e); send_volume_updated_signal(de, e); trigger_save(de->userdata); } @@ -886,6 +888,7 @@ static void handle_entry_set_mute(DBusConnection *conn, DBusMessage *msg, DBusMe value.size = sizeof(struct entry); pa_assert_se(pa_database_set(de->userdata->database, &key, &value, TRUE) == 0); + apply_entry(de->userdata, de->entry_name, e); send_mute_updated_signal(de, e); trigger_save(de->userdata); } -- cgit