From d7f7fd258db71e9a7169d43908ae2af64e2e6e82 Mon Sep 17 00:00:00 2001 From: Wim Taymans Date: Fri, 1 Sep 2023 12:26:13 +0200 Subject: [PATCH] pw-cat: set default properties after setup So that we can still set the MEDIA_NAME from the artist/title. --- src/tools/pw-cat.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c index 2a2057be9..d5665093e 100644 --- a/src/tools/pw-cat.c +++ b/src/tools/pw-cat.c @@ -1793,19 +1793,6 @@ int main(int argc, char *argv[]) } data.filename = argv[optind++]; - if (pw_properties_get(data.props, PW_KEY_MEDIA_TYPE) == NULL) - pw_properties_set(data.props, PW_KEY_MEDIA_TYPE, data.media_type); - if (pw_properties_get(data.props, PW_KEY_MEDIA_CATEGORY) == NULL) - pw_properties_set(data.props, PW_KEY_MEDIA_CATEGORY, data.media_category); - if (pw_properties_get(data.props, PW_KEY_MEDIA_ROLE) == NULL) - pw_properties_set(data.props, PW_KEY_MEDIA_ROLE, data.media_role); - if (pw_properties_get(data.props, PW_KEY_MEDIA_FILENAME) == NULL) - pw_properties_set(data.props, PW_KEY_MEDIA_FILENAME, data.filename); - if (pw_properties_get(data.props, PW_KEY_MEDIA_NAME) == NULL) - pw_properties_set(data.props, PW_KEY_MEDIA_NAME, data.filename); - if (pw_properties_get(data.props, PW_KEY_TARGET_OBJECT) == NULL) - pw_properties_set(data.props, PW_KEY_TARGET_OBJECT, data.target); - /* make a main loop. If you already have another main loop, you can add * the fd of this pipewire mainloop to it. */ data.loop = pw_main_loop_new(NULL); @@ -1874,6 +1861,19 @@ int main(int argc, char *argv[]) } ret = setup_properties(&data); + if (pw_properties_get(data.props, PW_KEY_MEDIA_TYPE) == NULL) + pw_properties_set(data.props, PW_KEY_MEDIA_TYPE, data.media_type); + if (pw_properties_get(data.props, PW_KEY_MEDIA_CATEGORY) == NULL) + pw_properties_set(data.props, PW_KEY_MEDIA_CATEGORY, data.media_category); + if (pw_properties_get(data.props, PW_KEY_MEDIA_ROLE) == NULL) + pw_properties_set(data.props, PW_KEY_MEDIA_ROLE, data.media_role); + if (pw_properties_get(data.props, PW_KEY_MEDIA_FILENAME) == NULL) + pw_properties_set(data.props, PW_KEY_MEDIA_FILENAME, data.filename); + if (pw_properties_get(data.props, PW_KEY_MEDIA_NAME) == NULL) + pw_properties_set(data.props, PW_KEY_MEDIA_NAME, data.filename); + if (pw_properties_get(data.props, PW_KEY_TARGET_OBJECT) == NULL) + pw_properties_set(data.props, PW_KEY_TARGET_OBJECT, data.target); + switch (data.data_type) { #ifdef HAVE_PW_CAT_FFMPEG_INTEGRATION case TYPE_ENCODED: