]> code.delx.au - pulseaudio/commitdiff
Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work
authorTanu Kaskinen <tanuk@iki.fi>
Sun, 30 Aug 2009 17:07:31 +0000 (20:07 +0300)
committerTanu Kaskinen <tanuk@iki.fi>
Sun, 30 Aug 2009 17:07:31 +0000 (20:07 +0300)
Conflicts:
src/modules/module-stream-restore.c

1  2 
src/Makefile.am
src/modules/module-stream-restore.c
src/pulse/proplist.c
src/pulsecore/core-util.c
src/pulsecore/cpu-x86.h

diff --cc src/Makefile.am
Simple merge
index d45cf792170039c9060d7a84717e432715aef988,d6e3c1534b8936d7be4c1c75b2da10696632baac..8389be67496adb4fff823c047dd7fd9e82656aef
@@@ -1834,40 -934,13 +1834,44 @@@ static int extension_cb(pa_native_proto
                  data.data = &entry;
                  data.size = sizeof(entry);
  
 -                if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0)
+                 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);
-                             || (entry.volume_valid
-                                 && (!pa_cvolume_equal(&entry.volume, &old->volume) || !pa_channel_map_equal(&entry.channel_map, &old->channel_map))))
 +                if (pa_database_set(u->database, &key, &data, mode == PA_UPDATE_REPLACE) == 0) {
 +#ifdef HAVE_DBUS
 +                    struct dbus_entry *de;
 +
 +                    if (old) {
 +                        pa_assert_se((de = pa_hashmap_get(u->dbus_entries, name)));
 +
 +                        if ((old->device_valid != entry.device_valid)
 +                            || (entry.device_valid && !pa_streq(entry.device, old->device)))
 +                            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))))
 +                            send_volume_updated_signal(de, &entry);
 +
 +                        if (!old->muted_valid || (entry.muted != old->muted))
 +                            send_mute_updated_signal(de, &entry);
 +
 +                    } else {
 +                        de = dbus_entry_new(u, name);
 +                        pa_assert_se(pa_hashmap_put(u->dbus_entries, de->entry_name, de));
 +                        send_new_entry_signal(de);
 +                    }
 +#endif
 +
                      if (apply_immediately)
                          apply_entry(u, name, &entry);
 +                }
 +
 +#ifdef HAVE_DBUS
 +                if (old)
 +                    pa_xfree(old);
 +#endif
              }
  
              trigger_save(u);
Simple merge
Simple merge
Simple merge