From 375acaed513f243195b131ad60147801683a67c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois=20Laignel?= Date: Wed, 9 Oct 2024 15:45:34 -0400 Subject: [PATCH] gst: hamonise recent Caps function names with Structure counterparts These functions were introduced as part of the GstIdStr MR: https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7432 Part-of: --- .../gst-plugins-base/gst-libs/gst/audio/audio-info.c | 2 +- .../gst-libs/gst/audio/gstaudioaggregator.c | 2 +- .../gst-plugins-base/gst-libs/gst/video/video-info.c | 2 +- subprojects/gstreamer/gst/gstcaps.c | 8 ++++---- subprojects/gstreamer/gst/gstcaps.h | 4 ++-- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-info.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-info.c index fd03c6ee43..695756e34b 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-info.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/audio-info.c @@ -386,7 +386,7 @@ gst_audio_info_to_caps (const GstAudioInfo * info) "but no channel positions present"); } - caps = gst_caps_new_simple_static_str ("audio/x-raw", + caps = gst_caps_new_static_str_simple ("audio/x-raw", "format", G_TYPE_STRING, format, "layout", G_TYPE_STRING, layout, "rate", G_TYPE_INT, info->rate, diff --git a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudioaggregator.c b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudioaggregator.c index 5d056efa8c..9da16c94ed 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudioaggregator.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/audio/gstaudioaggregator.c @@ -1070,7 +1070,7 @@ gst_audio_aggregator_sink_setcaps (GstAudioAggregatorPad * aaggpad, /* Returns NULL if there is no downstream peer */ if (downstream_caps) { GstCaps *rate_caps = - gst_caps_new_simple_static_str ("audio/x-raw", "rate", G_TYPE_INT, + gst_caps_new_static_str_simple ("audio/x-raw", "rate", G_TYPE_INT, info.rate, NULL); diff --git a/subprojects/gst-plugins-base/gst-libs/gst/video/video-info.c b/subprojects/gst-plugins-base/gst-libs/gst/video/video-info.c index 9ef4ed07b8..043c69ca97 100644 --- a/subprojects/gst-plugins-base/gst-libs/gst/video/video-info.c +++ b/subprojects/gst-plugins-base/gst-libs/gst/video/video-info.c @@ -678,7 +678,7 @@ gst_video_info_to_caps (const GstVideoInfo * info) format = gst_video_format_to_string (info->finfo->format); g_return_val_if_fail (format != NULL, NULL); - caps = gst_caps_new_simple_static_str ("video/x-raw", + caps = gst_caps_new_static_str_simple ("video/x-raw", "format", G_TYPE_STRING, format, "width", G_TYPE_INT, info->width, "height", G_TYPE_INT, info->height, NULL); diff --git a/subprojects/gstreamer/gst/gstcaps.c b/subprojects/gstreamer/gst/gstcaps.c index 720cd6ceff..a1d34b6a3d 100644 --- a/subprojects/gstreamer/gst/gstcaps.c +++ b/subprojects/gstreamer/gst/gstcaps.c @@ -319,7 +319,7 @@ gst_caps_new_empty_simple (const char *media_type) } /** - * gst_caps_new_empty_simple_static_str: + * gst_caps_new_static_str_empty_simple: * @media_type: the media type of the structure * * Creates a new #GstCaps that contains one #GstStructure with name @@ -333,7 +333,7 @@ gst_caps_new_empty_simple (const char *media_type) * Since: 1.26 */ GstCaps * -gst_caps_new_empty_simple_static_str (const char *media_type) +gst_caps_new_static_str_empty_simple (const char *media_type) { GstCaps *caps; GstStructure *structure; @@ -390,7 +390,7 @@ gst_caps_new_simple (const char *media_type, const char *fieldname, ...) } /** - * gst_caps_new_simple_static_str: + * gst_caps_new_static_str_simple: * @media_type: the media type of the structure * @fieldname: first field to set * @...: additional arguments @@ -407,7 +407,7 @@ gst_caps_new_simple (const char *media_type, const char *fieldname, ...) * Since: 1.26 */ GstCaps * -gst_caps_new_simple_static_str (const char *media_type, const char *fieldname, +gst_caps_new_static_str_simple (const char *media_type, const char *fieldname, ...) { GstCaps *caps; diff --git a/subprojects/gstreamer/gst/gstcaps.h b/subprojects/gstreamer/gst/gstcaps.h index 7afb527ec6..ece02a9be4 100644 --- a/subprojects/gstreamer/gst/gstcaps.h +++ b/subprojects/gstreamer/gst/gstcaps.h @@ -370,14 +370,14 @@ GST_API GstCaps * gst_caps_new_empty_simple (const char *media_type) G_GNUC_WARN_UNUSED_RESULT; GST_API -GstCaps * gst_caps_new_empty_simple_static_str (const char *media_type) G_GNUC_WARN_UNUSED_RESULT; +GstCaps * gst_caps_new_static_str_empty_simple (const char *media_type) G_GNUC_WARN_UNUSED_RESULT; GST_API GstCaps * gst_caps_new_simple (const char *media_type, const char *fieldname, ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; GST_API -GstCaps * gst_caps_new_simple_static_str (const char *media_type, +GstCaps * gst_caps_new_static_str_simple (const char *media_type, const char *fieldname, ...) G_GNUC_NULL_TERMINATED G_GNUC_WARN_UNUSED_RESULT; GST_API