diff --git a/src/context.c b/src/context.c index f18fb6eab..b4bc10afe 100644 --- a/src/context.c +++ b/src/context.c @@ -325,7 +325,6 @@ pa_context *pa_context_new_with_proplist(pa_mainloop_api *mainloop, const char * if (r == NULL) return NULL; - c = pw_remote_get_user_data(r); c->loop = loop; c->core = core; diff --git a/src/proplist.c b/src/proplist.c index 4ed222c3b..4cbc81211 100644 --- a/src/proplist.c +++ b/src/proplist.c @@ -164,8 +164,7 @@ const char *pa_proplist_iterate(pa_proplist *p, void **state) char *pa_proplist_to_string(pa_proplist *p) { spa_assert(p); - pw_log_warn("Not Implemented"); - return NULL; + return pa_proplist_to_string_sep(p, ","); } char *pa_proplist_to_string_sep(pa_proplist *p, const char *sep) diff --git a/src/stream.c b/src/stream.c index 471a06a5d..22da3bac5 100644 --- a/src/stream.c +++ b/src/stream.c @@ -504,6 +504,7 @@ pa_stream* stream_new(pa_context *c, const char *name, pa_stream *s; char str[1024]; int i; + struct pw_properties *props; spa_assert(c); spa_assert(c->refcount >= 1); @@ -517,11 +518,16 @@ pa_stream* stream_new(pa_context *c, const char *name, if (s == NULL) return NULL; + s->proplist = p ? pa_proplist_copy(p) : pa_proplist_new(); + if (name) + pa_proplist_sets(s->proplist, PA_PROP_MEDIA_NAME, name); + else + name = pa_proplist_gets(p, PA_PROP_MEDIA_NAME); - s->stream = pw_stream_new(c->remote, name, - pw_properties_new( - "client.api", "pulseaudio", - NULL)); + props = pw_properties_new("client.api", "pulseaudio", + NULL); + + s->stream = pw_stream_new(c->remote, name, props); s->refcount = 1; s->context = c; spa_list_init(&s->pending); @@ -554,10 +560,6 @@ pa_stream* stream_new(pa_context *c, const char *name, s->direct_on_input = PA_INVALID_INDEX; - s->proplist = p ? pa_proplist_copy(p) : pa_proplist_new(); - if (name) - pa_proplist_sets(s->proplist, PA_PROP_MEDIA_NAME, name); - s->stream_index = PA_INVALID_INDEX; s->buffer_attr.maxlength = (uint32_t) -1;