Merge branch 'master' of git://0pointer.de/pulseaudio into dbus-work

Conflicts:
	src/modules/module-stream-restore.c

1 files changed, 3 insertions, 0 deletions

diff --git a/src/pulsecore/source.c b/src/pulsecore/source.c
index 3026654e..1c77e0b9 100644
--- a/src/pulsecore/source.c
+++ b/src/pulsecore/source.c
@@ -205,6 +205,7 @@ pa_source* pa_source_new(
     s->core = core;
     s->state = PA_SOURCE_INIT;
     s->flags = flags;
+    s->priority = 0;
     s->suspend_cause = 0;
     s->name = pa_xstrdup(name);
     s->proplist = pa_proplist_copy(data->proplist);
@@ -212,6 +213,8 @@ pa_source* pa_source_new(
     s->module = data->module;
     s->card = data->card;
 
+    s->priority = pa_device_init_priority(s->proplist);
+
     s->sample_spec = data->sample_spec;
     s->channel_map = data->channel_map;