From f9a5053c73d470d04ed493f7b08936344b7225b2 Mon Sep 17 00:00:00 2001
From: Wim Taymans <wtaymans@redhat.com>
Date: Mon, 17 Aug 2020 17:50:15 +0200
Subject: [PATCH] media-session: improve cleanup in some modules

---
 src/examples/media-session/default-nodes.c   | 22 ++++++++++----------
 src/examples/media-session/default-profile.c | 19 +++++++++--------
 src/examples/media-session/default-routes.c  | 21 ++++++++++---------
 3 files changed, 32 insertions(+), 30 deletions(-)

diff --git a/src/examples/media-session/default-nodes.c b/src/examples/media-session/default-nodes.c
index e838b91f3..df0848d01 100644
--- a/src/examples/media-session/default-nodes.c
+++ b/src/examples/media-session/default-nodes.c
@@ -183,17 +183,6 @@ static const struct pw_metadata_events metadata_events = {
 	.property = metadata_property,
 };
 
-static void session_destroy(void *data)
-{
-	struct impl *impl = data;
-	remove_idle_timeout(impl);
-	spa_hook_remove(&impl->listener);
-	if (impl->session->metadata)
-		spa_hook_remove(&impl->meta_listener);
-	pw_properties_free(impl->properties);
-	free(impl);
-}
-
 static void session_create(void *data, struct sm_object *object)
 {
 	struct impl *impl = data;
@@ -230,6 +219,17 @@ static void session_remove(void *data, struct sm_object *object)
 		impl->default_video_source = SPA_ID_INVALID;
 }
 
+static void session_destroy(void *data)
+{
+	struct impl *impl = data;
+	remove_idle_timeout(impl);
+	spa_hook_remove(&impl->listener);
+	if (impl->session->metadata)
+		spa_hook_remove(&impl->meta_listener);
+	pw_properties_free(impl->properties);
+	free(impl);
+}
+
 static const struct sm_media_session_events session_events = {
 	SM_VERSION_MEDIA_SESSION_EVENTS,
 	.create = session_create,
diff --git a/src/examples/media-session/default-profile.c b/src/examples/media-session/default-profile.c
index 13ba0cbaa..608e85c19 100644
--- a/src/examples/media-session/default-profile.c
+++ b/src/examples/media-session/default-profile.c
@@ -115,15 +115,6 @@ static void add_idle_timeout(struct impl *impl)
 	pw_loop_update_timer(main_loop, impl->idle_timeout, &value, NULL, false);
 }
 
-static void session_destroy(void *data)
-{
-	struct impl *impl = data;
-	remove_idle_timeout(impl);
-	spa_hook_remove(&impl->listener);
-	pw_properties_free(impl->properties);
-	free(impl);
-}
-
 static uint32_t find_profile_id(struct device *dev, const char *name)
 {
 	struct sm_param *p;
@@ -258,6 +249,7 @@ static void session_create(void *data, struct sm_object *object)
 
 static void destroy_device(struct impl *impl, struct device *dev)
 {
+	spa_hook_remove(&dev->listener);
 	free(dev->name);
 	sm_object_remove_data((struct sm_object*)dev->obj, SESSION_KEY);
 }
@@ -276,6 +268,15 @@ static void session_remove(void *data, struct sm_object *object)
 		destroy_device(impl, dev);
 }
 
+static void session_destroy(void *data)
+{
+	struct impl *impl = data;
+	remove_idle_timeout(impl);
+	spa_hook_remove(&impl->listener);
+	pw_properties_free(impl->properties);
+	free(impl);
+}
+
 static const struct sm_media_session_events session_events = {
 	SM_VERSION_MEDIA_SESSION_EVENTS,
 	.create = session_create,
diff --git a/src/examples/media-session/default-routes.c b/src/examples/media-session/default-routes.c
index b29e72915..33068b1c2 100644
--- a/src/examples/media-session/default-routes.c
+++ b/src/examples/media-session/default-routes.c
@@ -112,16 +112,6 @@ static void add_idle_timeout(struct impl *impl)
 	pw_loop_update_timer(main_loop, impl->idle_timeout, &value, NULL, false);
 }
 
-static void session_destroy(void *data)
-{
-	struct impl *impl = data;
-	remove_idle_timeout(impl);
-	spa_hook_remove(&impl->listener);
-	pw_properties_free(impl->to_restore);
-	pw_properties_free(impl->to_save);
-	free(impl);
-}
-
 static char *serialize_props(struct device *dev, const struct spa_pod *param)
 {
 	struct spa_pod_prop *prop;
@@ -319,6 +309,7 @@ static void session_create(void *data, struct sm_object *object)
 
 static void destroy_device(struct impl *impl, struct device *dev)
 {
+	spa_hook_remove(&dev->listener);
 	free(dev->name);
 	sm_object_remove_data((struct sm_object*)dev->obj, SESSION_KEY);
 }
@@ -337,6 +328,16 @@ static void session_remove(void *data, struct sm_object *object)
 		destroy_device(impl, dev);
 }
 
+static void session_destroy(void *data)
+{
+	struct impl *impl = data;
+	remove_idle_timeout(impl);
+	spa_hook_remove(&impl->listener);
+	pw_properties_free(impl->to_restore);
+	pw_properties_free(impl->to_save);
+	free(impl);
+}
+
 static const struct sm_media_session_events session_events = {
 	SM_VERSION_MEDIA_SESSION_EVENTS,
 	.create = session_create,