media-session: expose metadata method

Expose a method to create an export metadata with a certain name.

src/examples/media-session/media-session.c

@@ -76,7 +76,6 @@
 
 int sm_access_flatpak_start(struct sm_media_session *sess);
 int sm_access_portal_start(struct sm_media_session *sess);
-int sm_metadata_start(struct sm_media_session *sess);
 int sm_default_nodes_start(struct sm_media_session *sess);
 int sm_default_profile_start(struct sm_media_session *sess);
 int sm_default_routes_start(struct sm_media_session *sess);
@@ -2054,6 +2053,14 @@ static void session_shutdown(struct impl *impl)
 		pw_core_info_free(impl->this.info);
 }
 
+static int sm_metadata_start(struct sm_media_session *sess)
+{
+	sess->metadata = sm_media_session_export_metadata(sess, "default");
+	if (sess->metadata == NULL)
+		return -errno;
+	return 0;
+}
+
 static int sm_pulse_bridge_start(struct sm_media_session *sess)
 {
 	if (pw_context_load_module(sess->context,

src/examples/media-session/media-session.h

@@ -265,6 +265,8 @@ int sm_media_session_for_each_object(struct sm_media_session *sess,
 
 int sm_media_session_schedule_rescan(struct sm_media_session *sess);
 
+struct pw_metadata *sm_media_session_export_metadata(struct sm_media_session *sess,
+		const char *name);
 struct pw_proxy *sm_media_session_export(struct sm_media_session *sess,
 		const char *type, const struct spa_dict *props,
 		void *object, size_t user_data_size);

src/examples/media-session/metadata.c

@@ -88,17 +88,15 @@ static int change_item(struct item *item, const char *type, const char *value)
 struct metadata {
 	struct spa_interface iface;
 
+	struct spa_hook_list hooks;
+	struct pw_array metadata;
+
 	struct sm_media_session *session;
 	struct spa_hook session_listener;
-
-	struct spa_hook_list hooks;
-
-	struct pw_properties *properties;
-	struct pw_array metadata;
 	struct pw_proxy *proxy;
 };
 
-static void emit_properties(struct metadata *this, const struct spa_dict *dict)
+static void emit_properties(struct metadata *this)
 {
 	struct item *item;
 	pw_array_for_each(item, &this->metadata) {
@@ -127,7 +125,7 @@ static int impl_add_listener(void *object,
 
 	spa_hook_list_isolate(&this->hooks, &save, listener, events, data);
 
-	emit_properties(this, &this->properties->dict);
+	emit_properties(this);
 
 	spa_hook_list_join(&this->hooks, &save);
 
@@ -228,7 +226,7 @@ static int impl_clear(void *object)
 	return 0;
 }
 
-struct pw_metadata_methods impl_metadata = {
+static const struct pw_metadata_methods impl_metadata = {
 	PW_VERSION_METADATA_METHODS,
 	.add_listener = impl_add_listener,
 	.set_property = impl_set_property,
@@ -245,13 +243,11 @@ static void session_destroy(void *data)
 {
 	struct metadata *this = data;
 
-	this->session->metadata = NULL;
 	spa_hook_remove(&this->session_listener);
 	pw_proxy_destroy(this->proxy);
 
 	clear_items(this);
 	pw_array_clear(&this->metadata);
-	pw_properties_free(this->properties);
 	free(this);
 }
 
@@ -261,45 +257,46 @@ static const struct sm_media_session_events session_events = {
 	.remove = session_remove,
 };
 
-int sm_metadata_start(struct sm_media_session *sess)
+struct pw_metadata *sm_media_session_export_metadata(struct sm_media_session *sess,
+		const char *name)
 {
-	struct metadata *md;
+	struct metadata *this;
 	int res;
+	struct spa_dict_item items[1];
 
-	md = calloc(1, sizeof(*md));
+	this = calloc(1, sizeof(*this));
-	if (md == NULL)
+	if (this == NULL)
-		return -errno;
+		goto error_errno;
 
-	md->session = sess;
+	pw_array_init(&this->metadata, 4096);
-	md->properties = pw_properties_new(NULL, NULL);
-	pw_array_init(&md->metadata, 4096);
 
-	md->iface = SPA_INTERFACE_INIT(
+	this->iface = SPA_INTERFACE_INIT(
 			PW_TYPE_INTERFACE_Metadata,
 			PW_VERSION_METADATA,
-			&impl_metadata, md);
+			&impl_metadata, this);
-        spa_hook_list_init(&md->hooks);
+        spa_hook_list_init(&this->hooks);
 
-	md->proxy = sm_media_session_export(sess,
+	items[0] = SPA_DICT_ITEM_INIT(PW_KEY_METADATA_NAME, name);
+
+	this->session = sess;
+	this->proxy = sm_media_session_export(sess,
 			PW_TYPE_INTERFACE_Metadata,
-			NULL,
+			&SPA_DICT_INIT_ARRAY(items),
-			md,
+			&this->iface,
 			0);
-	if (md->proxy == NULL) {
+	if (this->proxy == NULL)
-		res = -errno;
+		goto error_errno;
-		goto error_free;
-	}
 
-	sm_media_session_add_listener(sess, &md->session_listener,
+	sm_media_session_add_listener(sess, &this->session_listener,
-			&session_events, md);
+			&session_events, this);
 
-	sess->metadata = (struct pw_metadata *) &md->iface;
+	return (struct pw_metadata*)&this->iface;
-
-	return 0;
 
+error_errno:
+	res = -errno;
+	goto error_free;
 error_free:
-	pw_array_clear(&md->metadata);
+	free(this);
-	pw_properties_free(md->properties);
+	errno = -res;
-	free(md);
+	return NULL;
-	return res;
 }