media-session: improve cleanup in some modules

This commit is contained in:
Wim Taymans 2020-08-17 17:50:15 +02:00
parent 451fee2208
commit f9a5053c73
3 changed files with 32 additions and 30 deletions

View file

@ -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,