FaSTTUBe/GST-Tensordecoder-ov_ep
35
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

gst-editing-services: use g_sort_array() instead of deprecated g_qsort_with_data()

Browse Source 
Fixes compiler warnings with the latest GLib versions.

See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/4127

Part-of: <https://gitlab.freedesktop.org/gstreamer/gstreamer/-/merge_requests/7384>
This commit is contained in:
Tim-Philipp Müller 2024-08-20 02:09:39 +01:00 committed by GStreamer Marge Bot
parent 59d56bcb3f
commit 5e90f3eff7
3 changed files with 62 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
subprojects/gst-editing-services/ges/ges-container.c
View File

@ -41,6 +41,8 @@
#include "ges.h" #include "ges.h"
#include "ges-internal.h" #include "ges-internal.h"
#include "glib-compat-private.h"
#include <string.h> #include <string.h>
GST_DEBUG_CATEGORY_STATIC (ges_container_debug); GST_DEBUG_CATEGORY_STATIC (ges_container_debug);
@ -1022,7 +1024,7 @@ ges_container_group (GList * containers)
/* FIXME: how can user sub-classes interact with this if /* FIXME: how can user sub-classes interact with this if
* ->grouping_priority is private? */ * ->grouping_priority is private? */
children_types = g_type_children (GES_TYPE_CONTAINER, &n_children); children_types = g_type_children (GES_TYPE_CONTAINER, &n_children);
g_qsort_with_data (children_types, n_children, sizeof (GType), g_sort_array (children_types, n_children, sizeof (GType),
(GCompareDataFunc) compare_grouping_prio, NULL); (GCompareDataFunc) compare_grouping_prio, NULL);
for (i = 0; i < n_children; i++) { for (i = 0; i < n_children; i++) {

4
subprojects/gst-editing-services/ges/ges-timeline-element.c
View File

@ -120,6 +120,8 @@
#include <string.h> #include <string.h>
#include <gobject/gvaluecollector.h> #include <gobject/gvaluecollector.h>
#include "glib-compat-private.h"
/* maps type name quark => count */ /* maps type name quark => count */
static GData *object_name_counts = NULL; static GData *object_name_counts = NULL;
@ -2248,7 +2250,7 @@ ges_timeline_element_list_children_properties (GESTimelineElement * self,
} }
ret = class->list_children_properties (self, n_properties); ret = class->list_children_properties (self, n_properties);
g_qsort_with_data (ret, *n_properties, sizeof (GParamSpec *), g_sort_array (ret, *n_properties, sizeof (GParamSpec *),
(GCompareDataFunc) compare_gparamspec, NULL); (GCompareDataFunc) compare_gparamspec, NULL);
return ret; return ret;

56
subprojects/gst-editing-services/ges/glib-compat-private.h Normal file
View File

@ -0,0 +1,56 @@
/*
* glib-compat.c
* Functions copied from glib 2.10
*
* Copyright 2005 David Schleef <ds@schleef.org>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Library General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Library General Public License for more details.
*
* You should have received a copy of the GNU Library General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 51 Franklin St, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
#ifndef __GLIB_COMPAT_PRIVATE_H__
#define __GLIB_COMPAT_PRIVATE_H__
#include <glib.h>
G_BEGIN_DECLS
/* copies */
/* adaptations */
#if !GLIB_CHECK_VERSION(2, 81, 1)
#define g_sort_array(a,n,s,f,udata) gst_g_sort_array(a,n,s,f,udata)
// Don't need to maintain ABI compat here (n_elements), since we never pass
// the function as pointer but always call it directly ourselves.
static inline void
gst_g_sort_array (const void *array,
gssize n_elements,
size_t element_size,
GCompareDataFunc compare_func,
void *user_data)
{
if (n_elements >= 0 && n_elements <= G_MAXINT) {
g_qsort_with_data (array, n_elements, element_size, compare_func, user_data);
} else {
g_abort ();
}
}
#endif
G_END_DECLS
#endif