diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-30 20:07:31 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-08-30 20:07:31 +0300 |
| commit | 0ad2d55cbe86d13d5cd355f2b5d59360d681ccc2 (patch) | |
| tree | 42c290cd1f1c05c687d8134e40b63244d4fba4e9 /src/modules/module-stream-restore.c | |
| parent | 0e096632c53b746b9f4b4c0249d9e5a18c1c543d (diff) | |
| parent | 8bf2e3fe94e0dcd0a39a67c461b787d79adcd0dd (diff) | |
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
Conflicts:
src/modules/module-stream-restore.c
Diffstat (limited to 'src/modules/module-stream-restore.c')
| -rw-r--r-- | src/modules/module-stream-restore.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/modules/module-stream-restore.c b/src/modules/module-stream-restore.c index d45cf792..8389be67 100644 --- a/src/modules/module-stream-restore.c +++ b/src/modules/module-stream-restore.c @@ -1834,6 +1834,10 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio data.data = &entry; data.size = sizeof(entry); + pa_log_debug("Client %s changes entry %s.", + pa_strnull(pa_proplist_gets(pa_native_connection_get_client(c)->proplist, PA_PROP_APPLICATION_PROCESS_BINARY)), + name); + if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0) { #ifdef HAVE_DBUS struct dbus_entry *de; @@ -1846,8 +1850,8 @@ static int extension_cb(pa_native_protocol *p, pa_module *m, pa_native_connectio send_device_updated_signal(de, &entry); if ((old->volume_valid != entry.volume_valid) - || (entry.volume_valid - && (!pa_cvolume_equal(&entry.volume, &old->volume) || !pa_channel_map_equal(&entry.channel_map, &old->channel_map)))) + || (entry.volume_valid && (!pa_cvolume_equal(&entry.volume, &old->volume) + || !pa_channel_map_equal(&entry.channel_map, &old->channel_map)))) send_volume_updated_signal(de, &entry); if (!old->muted_valid || (entry.muted != old->muted)) |